Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unbreak RPM builds, add to Travis, add rpm support for collectors 300 directory #430

Merged
merged 7 commits into from
Sep 18, 2020
Merged

Unbreak RPM builds, add to Travis, add rpm support for collectors 300 directory #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1543ee5
Merge pull request #1 from OpenTSDB/master
tgwk Mar 8, 2019
8a8cb54
Adding rpm support for collectors 300 directory.
execshred Apr 4, 2019
2107d1f
Work with new rpmbuilds and latest files.
itamarst Sep 13, 2019
7217d86
Test RPM builds.
itamarst Sep 13, 2019
72feb4d
Add sudo for apt-get.
itamarst Sep 13, 2019
ed96307
Merge branch 'master' into execshred/adding-rpm-support-for-collector…
itamarst Sep 13, 2019
9746415
Merge branch 'master' into execshred/adding-rpm-support-for-collector…
johann8384 Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: python
sudo: true
dist: "xenial"
python:
- "2.7"
Expand All @@ -7,7 +8,9 @@ python:
- "3.6"
- "3.7"
install:
- sudo apt-get update && sudo apt-get install -y rpm
- pip install pylint pylint_runner ordereddict mysqlclient requests feedparser prometheus_client flask
script:
- cd rpm && make all && cd ..
- pylint_runner --rcfile .pylintrc
- ./tests.py
16 changes: 15 additions & 1 deletion rpm/tcollector.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ package will install the tcollector.py along with

%install
mkdir -p %{buildroot}/%{collectorsdir}/0/
mkdir -p %{buildroot}/%{collectorsdir}/300/
mkdir -p %{buildroot}/etc/init.d/

# set homedir in init script
Expand All @@ -37,14 +38,17 @@ mkdir -p %{buildroot}/etc/init.d/

# Install Base files
mkdir -p %{buildroot}%{tcollectordir}/collectors/lib/
mkdir -p %{buildroot}%{tcollectordir}/collectors/lib/docker_engine/
mkdir -p %{buildroot}%{tcollectordir}/collectors/etc/
%{__install} -m 0755 -D %{srccollectors}/__init__.py %{buildroot}%{tcollectordir}/collectors/
%{__install} -m 0755 -D %{srccollectors}/lib/* %{buildroot}%{tcollectordir}/collectors/lib/
%{__install} -m 0755 -D %{srccollectors}/lib/*.* %{buildroot}%{tcollectordir}/collectors/lib/
%{__install} -m 0755 -D %{srccollectors}/lib/docker_engine/* %{buildroot}%{tcollectordir}/collectors/lib/docker_engine/
%{__install} -m 0755 -D %{srccollectors}/etc/* %{buildroot}%{tcollectordir}/collectors/etc/
%{__install} -m 0755 -D %{rootdir}/tcollector.py %{buildroot}%{tcollectordir}/

# Install Collectors
%{__install} -m 0755 -D %{srccollectors}/0/* %{buildroot}%{collectorsdir}/0/
%{__install} -m 0755 -D %{srccollectors}/300/* %{buildroot}%{collectorsdir}/300/

# Install EOS files
%{__install} -m 0755 -D %{eosdir}/collectors/agent*.sh %{buildroot}/%{collectorsdir}/0/
Expand All @@ -55,6 +59,16 @@ mkdir -p %{buildroot}/%{py2_sitelib}/
%{__install} -m 0755 -D %{eosdir}/tcollector_agent.py %{buildroot}/%{py2_sitelib}/


# Modern rpmbuild wants either python2 or python3
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}%{tcollectordir}/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{eosdir}/tcollector_agent.py %{buildroot}/%{py2_sitelib}/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}%{tcollectordir}/collectors/etc/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}%{tcollectordir}/collectors/0/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}%{tcollectordir}/collectors/300/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}%{tcollectordir}/collectors/lib/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}%{tcollectordir}/collectors/lib/docker_engine/*.py
%{__perl} -pe "s|/usr/bin/env python|/usr/bin/env python2|;" -i %{buildroot}/usr/bin/tcollector

%files
%dir %{tcollectordir}
%attr(755, -, -) /etc/init.d/tcollector
Expand Down