Skip to content

Commit 0b9137d

Browse files
ajragusaveorlo
ajragusa
authored and
veorlo
committed
cleaning up for pull to master
1 parent b047d2c commit 0b9137d

File tree

8 files changed

+585
-7
lines changed

8 files changed

+585
-7
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Local Virtual Environment
22
venv/*
3-
3+
.vscode/*
44
# Files generated in build process
55
dist/*
66
/MYMETA.json

‎Makefile

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,90 @@ test: venv
77
/usr/bin/perl -I ./lib -I ./venv/lib/perl5 t/TEST $(TEST_VERBOSE)
88

99
rpm: dist
10-
cd dist; tar -czvf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)
11-
rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz
10+
cd dist;
11+
#rpmbuild -ta dist/simp-poller-$(VERSION).tar.gz
12+
rpmbuild -ta dist/simp-data-$(VERSION).tar.gz
13+
rpmbuild -ta dist/simp-comp-$(VERSION).tar.gz
14+
rpmbuild -ta dist/simp-tsds-$(VERSION).tar.gz
15+
rpmbuild -ta dist/simp-env-$(VERSION).tar.gz
1216

1317
clean:
1418
rm -rf dist/$(NAME)-$(VERSION)/
1519
rm -rf dist
1620
rm -rf venv
1721

1822
dist: clean venv
19-
mkdir -p dist/$(NAME)-$(VERSION)/
20-
cp -rv bin conf lib venv $(NAME).spec dist/$(NAME)-$(VERSION)/
21-
cd dist; tar -czvf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)/
23+
mkdir -p dist/simp-data-$(VERSION)/lib/GRNOC/Simp
24+
mkdir -p dist/simp-data-$(VERSION)/bin
25+
mkdir -p dist/simp-data-$(VERSION)/conf/data
26+
mkdir -p dist/simp-comp-$(VERSION)/lib/GRNOC/Simp
27+
mkdir -p dist/simp-comp-$(VERSION)/bin
28+
mkdir -p dist/simp-comp-$(VERSION)/scripts
29+
mkdir -p dist/simp-comp-$(VERSION)/conf/comp
30+
mkdir -p dist/simp-poller-$(VERSION)/lib/GRNOC/Simp
31+
mkdir -p dist/simp-poller-$(VERSION)/bin
32+
mkdir -p dist/simp-poller-$(VERSION)/conf/poller
33+
mkdir -p dist/simp-tsds-$(VERSION)/lib/GRNOC/Simp
34+
mkdir -p dist/simp-tsds-$(VERSION)/bin
35+
mkdir -p dist/simp-tsds-$(VERSION)/conf/tsds
36+
mkdir -p dist/simp-env-$(VERSION)/
2237

38+
cp -r lib/GRNOC/Simp/Poller* dist/simp-poller-$(VERSION)/lib/GRNOC/Simp
39+
cp -r lib/GRNOC/Simp/Data* dist/simp-data-$(VERSION)/lib/GRNOC/Simp
40+
cp -r lib/GRNOC/Simp/Comp* dist/simp-comp-$(VERSION)/lib/GRNOC/Simp
41+
cp -r lib/GRNOC/Simp/TSDS* dist/simp-tsds-$(VERSION)/lib/GRNOC/Simp
42+
43+
cp -r bin/simp-poller.pl dist/simp-poller-$(VERSION)/bin/
44+
cp -r bin/simp-data.pl dist/simp-data-$(VERSION)/bin/
45+
cp -r bin/simp-comp.pl dist/simp-comp-$(VERSION)/bin/
46+
cp -r bin/simp-tsds.pl dist/simp-tsds-$(VERSION)/bin/
47+
cp -r bin/simp-test.pl dist/simp-comp-$(VERSION)/scripts
48+
49+
cp -r conf/poller/config.xml dist/simp-poller-$(VERSION)/conf/poller/
50+
cp -r conf/poller/config.xsd dist/simp-poller-$(VERSION)/conf/poller/
51+
cp -r conf/poller/simp-poller.systemd dist/simp-poller-$(VERSION)/conf/poller/
52+
cp -r conf/poller/simp-poller.service dist/simp-poller-$(VERSION)/conf/poller/
53+
cp -r conf/poller/hosts.xml.example dist/simp-poller-$(VERSION)/conf/poller/
54+
cp -r conf/poller/hosts.xsd dist/simp-poller-$(VERSION)/conf/poller/
55+
cp -r conf/poller/group.xml.example dist/simp-poller-$(VERSION)/conf/poller/
56+
cp -r conf/poller/group.xsd dist/simp-poller-$(VERSION)/conf/poller
57+
58+
cp -r conf/data/config.xml dist/simp-data-$(VERSION)/conf/data/
59+
cp -r conf/data/config.xsd dist/simp-data-$(VERSION)/conf/data/
60+
cp -r conf/data/simp-data.systemd dist/simp-data-$(VERSION)/conf/data/
61+
cp -r conf/data/simp-data.service dist/simp-data-$(VERSION)/conf/data/
62+
63+
cp -r conf/comp/config.xml dist/simp-comp-$(VERSION)/conf/comp/
64+
cp -r conf/comp/config.xsd dist/simp-comp-$(VERSION)/conf/comp/
65+
cp -r conf/comp/composite.xml.example dist/simp-comp-$(VERSION)/conf/comp/
66+
cp -r conf/comp/composite.xsd dist/simp-comp-$(VERSION)/conf/comp/
67+
cp -r conf/comp/simp-comp.systemd dist/simp-comp-$(VERSION)/conf/comp/
68+
cp -r conf/comp/simp-comp.service dist/simp-comp-$(VERSION)/conf/comp/
69+
70+
cp -r conf/tsds/config.xml dist/simp-tsds-$(VERSION)/conf/tsds/
71+
cp -r conf/tsds/config.xsd dist/simp-tsds-$(VERSION)/conf/tsds/
72+
cp -r conf/tsds/collection.xml.example dist/simp-tsds-$(VERSION)/conf/tsds/
73+
cp -r conf/tsds/collection.xsd dist/simp-tsds-$(VERSION)/conf/tsds/
74+
cp -r conf/tsds/simp-tsds.systemd dist/simp-tsds-$(VERSION)/conf/tsds/
75+
cp -r conf/tsds/simp-tsds.service dist/simp-tsds-$(VERSION)/conf/tsds/
76+
77+
cp -r conf/logging.conf dist/simp-poller-$(VERSION)/conf/
78+
cp -r conf/logging.conf dist/simp-data-$(VERSION)/conf/
79+
cp -r conf/logging.conf dist/simp-comp-$(VERSION)/conf/
80+
cp -r conf/logging.conf dist/simp-tsds-$(VERSION)/conf/
81+
82+
cp -r spec/simp-data.spec dist/simp-data-$(VERSION)/
83+
cp -r spec/simp-comp.spec dist/simp-comp-$(VERSION)/
84+
cp -r spec/simp-poller.spec dist/simp-poller-$(VERSION)/
85+
cp -r spec/simp-tsds.spec dist/simp-tsds-$(VERSION)/
86+
87+
cp -r spec/simp-env.spec dist/simp-env-$(VERSION)/
88+
cp -r venv/ dist/simp-env-$(VERSION)/
89+
90+
cd dist; tar -czvf simp-poller-$(VERSION).tar.gz simp-poller-$(VERSION)/
91+
cd dist; tar -czvf simp-data-$(VERSION).tar.gz simp-data-$(VERSION)/
92+
cd dist; tar -czvf simp-comp-$(VERSION).tar.gz simp-comp-$(VERSION)/
93+
cd dist; tar -czvf simp-tsds-$(VERSION).tar.gz simp-tsds-$(VERSION)/
94+
cd dist; tar -czvf simp-env-$(VERSION).tar.gz simp-env-$(VERSION)/
2395
venv:
2496
carton install --deployment --path=venv

‎spec/simp-comp.spec

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
Summary: A system for fetching data from simp and compiling the data into a composite
2+
Name: simp-comp
3+
Version: 1.11.3
4+
Release: 1%{dist}
5+
License: GRNOC
6+
Group: GRNOC
7+
URL: http://globalnoc.iu.edu/simp
8+
Source0: simp-comp-%{version}.tar.gz
9+
BuildArch: noarch
10+
11+
# This prevents automatic dependency resolution from failing in external imports.
12+
# Without it, the created RPMs may not install properly
13+
AutoReqProv: no
14+
15+
BuildRequires: perl
16+
BuildRequires: perl(Test::Deep)
17+
BuildRequires: perl(Test::More)
18+
BuildRequires: perl(Test::Pod) >= 1.22
19+
20+
%if 0%{?rhel} <= 8
21+
Requires: perl(AnyEvent)
22+
Requires: perl(List::MoreUtils)
23+
Requires: perl(Data::Munge)
24+
Requires: perl-Moo
25+
Requires: perl-Parallel-ForkManager
26+
Requires: perl(POSIX)
27+
Requires: perl(Time::HiRes)
28+
Requires: perl-Try-Tiny
29+
Requires: perl-Type-Tiny
30+
%endif
31+
Requires: perl-GRNOC-Log
32+
Requires: perl-GRNOC-Config
33+
Requires: perl-GRNOC-RabbitMQ >= 1.2.1
34+
35+
%if 0%{?rhel} >= 8
36+
Requires: simp-env
37+
%endif
38+
39+
Provides: perl(GRNOC::Simp::Comp)
40+
Provides: perl(GRNOC::Simp::Comp::Worker)
41+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
42+
43+
%description
44+
45+
%prep
46+
%setup -q -n simp-comp-%{version}
47+
48+
%build
49+
50+
%pre
51+
/usr/bin/getent group simp || /usr/sbin/groupadd -r simp
52+
/usr/bin/getent passwd simp || /usr/sbin/useradd -r -s /sbin/nologin -g simp simp
53+
54+
%post
55+
systemctl daemon-reload
56+
57+
%install
58+
rm -rf $RPM_BUILD_ROOT
59+
%{__install} -d -p %{buildroot}%{perl_vendorlib}/GRNOC/Simp/Comp
60+
%{__install} -d -p %{buildroot}/etc/systemd/system/
61+
%{__install} -d -p %{buildroot}/etc/init.d/
62+
%{__install} -d -p %{buildroot}/usr/bin/
63+
%{__install} -d -p %{buildroot}/etc/simp
64+
%{__install} -d -p %{buildroot}/etc/simp/comp
65+
%{__install} -d -p %{buildroot}/etc/simp/comp/composites.d
66+
%{__install} -d -p %{buildroot}/etc/simp/comp/validation.d
67+
68+
%{__install} lib/GRNOC/Simp/Comp.pm %{buildroot}%{perl_vendorlib}/GRNOC/Simp/Comp.pm
69+
%{__install} lib/GRNOC/Simp/Comp/Worker.pm %{buildroot}%{perl_vendorlib}/GRNOC/Simp/Comp/Worker.pm
70+
%{__install} bin/simp-comp.pl %{buildroot}/usr/bin/simp-comp.pl
71+
%{__install} conf/comp/config.xml %{buildroot}/etc/simp/comp/config.xml
72+
%{__install} conf/comp/composite.xml.example %{buildroot}/etc/simp/comp/composites.d/composite.xml.example
73+
%{__install} conf/logging.conf %{buildroot}/etc/simp/comp/logging.conf
74+
%{__install} conf/comp/config.xsd %{buildroot}/etc/simp/comp/validation.d/config.xsd
75+
%{__install} conf/comp/composite.xsd %{buildroot}/etc/simp/comp/validation.d/composite.xsd
76+
77+
%{__install} scripts/simp-test.pl %{buildroot}/usr/bin/simp-test.pl
78+
79+
%if 0%{?rhel} >= 7
80+
%{__install} conf/comp/simp-comp.systemd %{buildroot}/etc/systemd/system/simp-comp.service
81+
%else
82+
%{__install} conf/comp/simp-comp.service %{buildroot}/etc/init.d/simp-comp
83+
%endif
84+
85+
%clean
86+
rm -rf $RPM_BUILD_ROOT
87+
88+
%files
89+
%defattr(644,root,root,755)
90+
%{perl_vendorlib}/GRNOC/Simp/Comp.pm
91+
%{perl_vendorlib}/GRNOC/Simp/Comp/Worker.pm
92+
93+
%defattr(755,root,root,755)
94+
/usr/bin/simp-comp.pl
95+
/usr/bin/simp-test.pl
96+
97+
%defattr(644,root,root,644)
98+
/etc/simp/comp/validation.d/config.xsd
99+
/etc/simp/comp/validation.d/composite.xsd
100+
101+
%if 0%{?rhel} >= 7
102+
/etc/systemd/system/simp-comp.service
103+
%else
104+
/etc/init.d/simp-comp
105+
%endif
106+
107+
%defattr(644,root,root,755)
108+
%config(noreplace) /etc/simp/comp/logging.conf
109+
%config(noreplace) /etc/simp/comp/config.xml
110+
%config(noreplace) /etc/simp/comp/composites.d/*
111+
112+
%doc

‎spec/simp-data.spec

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
Summary: A small system for fetching SNMP data from redis and returning it via RabbitMQ
2+
Name: simp-data
3+
Version: 1.11.3
4+
Release: 1%{dist}
5+
License: GRNOC
6+
Group: GRNOC
7+
URL: http://globalnoc.iu.edu/simp
8+
Source0: simp-data-%{version}.tar.gz
9+
10+
BuildArch: noarch
11+
# This prevents automatic dependency resolution from failing in external imports.
12+
# Without it, the created RPMs may not install properly
13+
AutoReqProv: no
14+
15+
BuildRequires: perl
16+
BuildRequires: perl(Test::Deep)
17+
BuildRequires: perl(Test::More)
18+
BuildRequires: perl(Test::Pod) >= 1.22
19+
%if 0%{?rhel} <= 8
20+
Requires: redis
21+
Requires: perl(AnyEvent)
22+
Requires: perl(List::MoreUtils)
23+
Requires: perl(Data::Munge)
24+
25+
Requires: perl-Moo
26+
Requires: perl-Parallel-ForkManager
27+
Requires: perl(POSIX)
28+
Requires: perl-Redis-Fast >= 0.28
29+
Requires: perl-Syntax-Keyword-Try
30+
Requires: perl-Type-Tiny
31+
Requires: perl(Class::Accessor::Fast)
32+
%endif
33+
Requires: perl-GRNOC-Log
34+
Requires: perl-GRNOC-Config
35+
Requires: perl-GRNOC-RabbitMQ >= 1.2.1
36+
%if 0%{?rhel} >= 8
37+
Requires: simp-env
38+
%endif
39+
40+
Provides: perl(GRNOC::Simp::Data)
41+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
42+
43+
%description
44+
45+
%prep
46+
%setup -q -n simp-data-%{version}
47+
48+
%build
49+
50+
%pre
51+
/usr/bin/getent group simp || /usr/sbin/groupadd -r simp
52+
/usr/bin/getent passwd simp || /usr/sbin/useradd -r -s /sbin/nologin -g simp simp
53+
54+
%post
55+
systemctl daemon-reload
56+
57+
%install
58+
rm -rf $RPM_BUILD_ROOT
59+
%{__install} -d -p %{buildroot}%{perl_vendorlib}/GRNOC/Simp/Data
60+
%{__install} -d -p %{buildroot}/etc/systemd/system/
61+
%{__install} -d -p %{buildroot}/etc/init.d/
62+
%{__install} -d -p %{buildroot}/usr/bin/
63+
%{__install} -d -p %{buildroot}/etc/simp
64+
%{__install} -d -p %{buildroot}/etc/simp/data
65+
%{__install} -d -p %{buildroot}/etc/simp/data/validation.d
66+
67+
%{__install} lib/GRNOC/Simp/Data.pm %{buildroot}%{perl_vendorlib}/GRNOC/Simp/Data.pm
68+
%{__install} lib/GRNOC/Simp/Data/Worker.pm %{buildroot}%{perl_vendorlib}/GRNOC/Simp/Data/Worker.pm
69+
%{__install} bin/simp-data.pl %{buildroot}/usr/bin/simp-data.pl
70+
%{__install} conf/data/config.xml %{buildroot}/etc/simp/data/config.xml
71+
%{__install} conf/data/config.xsd %{buildroot}/etc/simp/data/validation.d/config.xsd
72+
%{__install} conf/logging.conf %{buildroot}/etc/simp/data/logging.conf
73+
74+
%if 0%{?rhel} >= 7
75+
%{__install} conf/data/simp-data.systemd %{buildroot}/etc/systemd/system/simp-data.service
76+
%else
77+
%{__install} conf/data/simp-data.service %{buildroot}/etc/init.d/simp-data
78+
%endif
79+
80+
%clean
81+
rm -rf $RPM_BUILD_ROOT
82+
83+
%files
84+
%defattr(644,root,root,755)
85+
%{perl_vendorlib}/GRNOC/Simp/Data.pm
86+
%{perl_vendorlib}/GRNOC/Simp/Data/Worker.pm
87+
88+
%defattr(755,root,root,755)
89+
/usr/bin/simp-data.pl
90+
91+
%defattr(644,root,root,644)
92+
/etc/simp/data/validation.d/config.xsd
93+
94+
%if 0%{?rhel} >= 7
95+
/etc/systemd/system/simp-data.service
96+
%else
97+
/etc/init.d/simp-data
98+
%endif
99+
100+
%defattr(644,root,root,755)
101+
%config(noreplace) /etc/simp/data/config.xml
102+
%config(noreplace) /etc/simp/data/logging.conf
103+
104+
%doc

‎spec/simp-env.spec

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
Summary: A system for fetching data from simp and compiling the data into a composite
2+
Name: simp-env
3+
Version: 1.11.3
4+
Release: 1%{dist}
5+
License: GRNOC
6+
Group: GRNOC
7+
URL: http://globalnoc.iu.edu/simp
8+
Source0: simp-env-%{version}.tar.gz
9+
%global debug_package %{nil}
10+
# This prevents automatic dependency resolution from failing in external imports.
11+
# Without it, the created RPMs may not install properly
12+
AutoReqProv: no
13+
14+
BuildRequires: perl
15+
Requires: perl-GRNOC-Log
16+
Requires: perl-GRNOC-Config
17+
Requires: perl-GRNOC-RabbitMQ >= 1.2.1
18+
Requires: perl-GRNOC-WebService-Client
19+
Requires: perl-GRNOC-Monitoring-Service-Status
20+
21+
%description
22+
This program pulls SNMP-derived data from Simp and publishes it to TSDS.
23+
24+
%pre
25+
/usr/bin/getent group simp > /dev/null || /usr/sbin/groupadd -r simp
26+
/usr/bin/getent passwd simp > /dev/null || /usr/sbin/useradd -r -s /bin/nologin -g simp simp
27+
28+
%post
29+
systemctl daemon-reload
30+
31+
%prep
32+
%setup -q
33+
34+
%build
35+
36+
%install
37+
rm -rf $RPM_BUILD_ROOT
38+
%{__install} -d -p %{buildroot}/opt/grnoc/venv/simp/lib/perl5
39+
cp -r venv/lib/perl5/* -t %{buildroot}/opt/grnoc/venv/simp/lib/perl5
40+
41+
# clean up buildroot
42+
#find %{buildroot} -name .packlist -exec %{__rm} {} \;
43+
44+
#%{_fixperms} %{buildroot}/*
45+
46+
%clean
47+
rm -rf %{buildroot}
48+
49+
%files
50+
%defattr(-, simp, simp, 755)
51+
/opt/grnoc/venv/simp/lib/perl5/*

0 commit comments

Comments
 (0)