From 754de72714ceb07762e036cca6155887794f7236 Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Mon, 12 Aug 2024 21:14:01 -0300 Subject: [PATCH 1/6] Making host_exporter a Flask app that runs via mod_wsgi --- .../apache-perfsonar_host_exporter.conf | 29 +++++++-------- .../perfsonar-host-metrics/host_exporter.wsgi | 8 ++++ .../perfsonar-host-exporter.service | 12 ------ ...st_exporter => perfsonar_host_exporter.py} | 37 ++++++++----------- 4 files changed, 37 insertions(+), 49 deletions(-) create mode 100644 perfsonar-host-metrics/perfsonar-host-metrics/host_exporter.wsgi delete mode 100644 perfsonar-host-metrics/perfsonar-host-metrics/perfsonar-host-exporter.service rename perfsonar-host-metrics/perfsonar-host-metrics/{perfsonar_host_exporter => perfsonar_host_exporter.py} (91%) diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/apache-perfsonar_host_exporter.conf b/perfsonar-host-metrics/perfsonar-host-metrics/apache-perfsonar_host_exporter.conf index cb57e29..75f6134 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/apache-perfsonar_host_exporter.conf +++ b/perfsonar-host-metrics/perfsonar-host-metrics/apache-perfsonar_host_exporter.conf @@ -1,16 +1,15 @@ - - ProxyRequests Off - - = 2.4> - Require all granted - - - Order deny,allow - Allow from all - - +# WSGI settings +WSGIDaemonProcess host_exporter display-name=host_exporter user=perfsonar group=perfsonar threads=5 +WSGIScriptAlias /perfsonar_host_exporter /var/www/html/perfsonar/host_exporter/host_exporter.wsgi +WSGIApplicationGroup %{GLOBAL} - ProxyPass /perfsonar_host_exporter http://localhost:11284 status=+I - ProxyPassReverse /perfsonar_host_exporter http://localhost:11284 status=+I - ProxyPreserveHost On - + + + SSLRequireSSL + + WSGIProcessGroup host_exporter + WSGIApplicationGroup host_exporter + + Require all granted + + diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/host_exporter.wsgi b/perfsonar-host-metrics/perfsonar-host-metrics/host_exporter.wsgi new file mode 100644 index 0000000..25b2697 --- /dev/null +++ b/perfsonar-host-metrics/perfsonar-host-metrics/host_exporter.wsgi @@ -0,0 +1,8 @@ +# +# WSGI File for host_exporter +# +import sys + +sys.path.insert(0, '/var/www/html/perfsonar/host_exporter') + +from host_exporter.perfsonar_host_exporter import app as application diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar-host-exporter.service b/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar-host-exporter.service deleted file mode 100644 index 3b14580..0000000 --- a/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar-host-exporter.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=perfSONAR Host Exporter -After=network.target - -[Service] -Type=simple -ExecStart=/usr/lib/perfsonar/host_metrics/perfsonar_host_exporter -Restart=always -RestartSec=30s - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar_host_exporter b/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar_host_exporter.py similarity index 91% rename from perfsonar-host-metrics/perfsonar-host-metrics/perfsonar_host_exporter rename to perfsonar-host-metrics/perfsonar-host-metrics/perfsonar_host_exporter.py index 4f2de32..2f637f9 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar_host_exporter +++ b/perfsonar-host-metrics/perfsonar-host-metrics/perfsonar_host_exporter.py @@ -6,9 +6,11 @@ import subprocess from psconfig.utilities.metrics import PSConfigMetricCalculator from psconfig.utilities.cli import PSCONFIG_CLI_AGENTS -from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer +from flask import Flask, Response -class PSMetricsWebHandler(BaseHTTPRequestHandler): +app = Flask(__name__) + +class PSMetricsWebHandler: LS_BASE_URL = "http://35.223.142.206:8090/lookup/records" def _read_one_liner(self, filename): @@ -111,31 +113,24 @@ def lookup_svc_metrics(self): ps_metric_output += 'perfsonar_host_registered{{uuid="{}"}} {}\n'.format(uuid, self._is_registered(uuid)) return ps_metric_output - - def do_GET(self): + + def gather_metrics(self): ps_metric_output = "" - - ## # toolkit/bundle metrics - ps_metric_output += self.bundle_metrics() - - ## + ps_metric_output += self.bundle_metrics() # pScheduler metrics ps_metric_output += self.pscheduler_metrics() - - ## # pSConfig Metrics ps_metric_output += self.psconfig_metrics() - - ## # LS client uuid ps_metric_output += self.lookup_svc_metrics() - - self.send_response(200) - self.send_header("Content-Type", "text/plain") - self.end_headers() - self.wfile.write(ps_metric_output.encode("utf-8")) + return ps_metric_output +@app.route("/") +def metrics(): + handler = PSMetricsWebHandler() + metrics_data = handler.gather_metrics() + return Response(metrics_data, status=200, mimetype="text/plain") if __name__ == "__main__": ## @@ -147,7 +142,5 @@ def do_GET(self): parser.add_argument('--host', dest='host', action='store', default='localhost', help='The host to listen for connections. 0.0.0.0 means all interfaces.') parser.add_argument('--port', dest='port', action='store', type=int, default=11284, help='The port on which to listen for connections.') args = parser.parse_args() - - #Build server - server = ThreadingHTTPServer((args.host, args.port), PSMetricsWebHandler) - server.serve_forever() \ No newline at end of file + + app.run(host=args.host, port=args.port) \ No newline at end of file From 44413b12c9f8dd1460981b86c8ed8dc5afc92dff Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Mon, 12 Aug 2024 21:15:35 -0300 Subject: [PATCH 2/6] Updating rpm spec files to work with mod_wsgi --- .../perfsonar-host-metrics/Makefile | 8 +++++++- .../rpm/perfsonar-host-metrics.spec | 16 ++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/Makefile b/perfsonar-host-metrics/perfsonar-host-metrics/Makefile index 1b62c44..20e0e72 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/Makefile +++ b/perfsonar-host-metrics/perfsonar-host-metrics/Makefile @@ -11,13 +11,19 @@ endif ifndef HTTPD-CONFIGPATH @echo No HTTPD-CONFIGPATH specified for installation @false +endif +ifndef WSGI-CONFIGPATH + @echo No WSGI-CONFIGPATH specified for installation + @false endif mkdir -p ${PERFSONAR-ROOTPATH} mkdir -p ${HTTPD-CONFIGPATH} + mkdir -p ${WSGI-CONFIGPATH} install -m 755 exporter_opts.sh ${PERFSONAR-ROOTPATH}/ - install -m 755 perfsonar_host_exporter ${PERFSONAR-ROOTPATH}/ + install -m 755 perfsonar_host_exporter.py ${PERFSONAR-ROOTPATH}/ install -m 644 apache-node_exporter.conf ${HTTPD-CONFIGPATH}/ install -m 644 apache-perfsonar_host_exporter.conf ${HTTPD-CONFIGPATH}/ + install -m 644 host_exporter.wsgi ${WSGI-CONFIGPATH}/ clean: @true diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec index 69a4847..d277eb3 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec @@ -1,6 +1,7 @@ %define install_base /usr/lib/perfsonar %define pkg_install_base %{install_base}/host_metrics %define httpd_config_base /etc/httpd/conf.d +%define wsgi_config_base /var/www/html/perfsonar/host_exporter #Version variables set by automated scripts %define perfsonar_auto_version 5.2.0 @@ -72,9 +73,7 @@ A package that installs and sets-up Prometheus node_exporter for a perfSONAR ins make -f /usr/share/selinux/devel/Makefile -C selinux perfsonar_host_metrics.pp %install -make PERFSONAR-ROOTPATH=%{buildroot}/%{pkg_install_base} HTTPD-CONFIGPATH=%{buildroot}/%{httpd_config_base} install -mkdir -p %{buildroot}/%{_unitdir}/ -install -m 644 *.service %{buildroot}/%{_unitdir}/ +make PERFSONAR-ROOTPATH=%{buildroot}/%{pkg_install_base} HTTPD-CONFIGPATH=%{buildroot}/%{httpd_config_base} WSGI-CONFIGPATH=%{buildroot}/%{wsgi_config_base} install mkdir -p %{buildroot}/usr/share/selinux/packages/ mv selinux/*.pp %{buildroot}/usr/share/selinux/packages/ @@ -82,6 +81,7 @@ mv selinux/*.pp %{buildroot}/usr/share/selinux/packages/ rm -rf %{buildroot} %post +ln -sT -f %{pkg_install_base} %{wsgi_config_base}/host_exporter #selinux semodule -n -i /usr/share/selinux/packages/perfsonar_host_metrics.pp @@ -91,7 +91,6 @@ fi #Restart/enable opensearch and logstash %systemd_post node_exporter.service -%systemd_post perfsonar-host-exporter.service if [ "$1" = "1" ]; then #set SELinux booleans to allow httpd proxy to work %selinux_set_booleans -s %{selinuxtype} %{selinuxbooleans} @@ -103,8 +102,6 @@ if [ "$1" = "1" ]; then systemctl daemon-reload systemctl enable node_exporter.service systemctl restart node_exporter.service - systemctl enable perfsonar-host-exporter.service - systemctl restart perfsonar-host-exporter.service #Enable and restart apache for reverse proxy systemctl enable httpd systemctl restart httpd @@ -115,11 +112,10 @@ fi %preun %systemd_preun node_exporter.service -%systemd_preun perfsonar-host-exporter.service %postun ++%{__rm} -f %{wsgi_config_base}/host_exporter %systemd_postun_with_restart node_exporter.service -%systemd_postun_with_restart perfsonar-host-exporter.service if [ $1 -eq 0 ]; then %selinux_unset_booleans -s %{selinuxtype} %{selinuxbooleans} semodule -n -r perfsonar_host_metrics @@ -132,11 +128,11 @@ fi %defattr(0644,perfsonar,perfsonar,0755) %license LICENSE %attr(0755, perfsonar, perfsonar) %{pkg_install_base}/exporter_opts.sh -%attr(0755, perfsonar, perfsonar) %{pkg_install_base}/perfsonar_host_exporter +%attr(0755, perfsonar, perfsonar) %{pkg_install_base}/perfsonar_host_exporter.py %attr(0644, perfsonar, perfsonar) %{httpd_config_base}/apache-node_exporter.conf %attr(0644, perfsonar, perfsonar) %{httpd_config_base}/apache-perfsonar_host_exporter.conf +%attr(0644, perfsonar, perfsonar) %{wsgi_config_base}/host_exporter.wsgi %attr(0644,root,root) /usr/share/selinux/packages/* -%{_unitdir}/perfsonar-host-exporter.service %changelog * Tue Oct 24 2023 andy@es.net 5.0.5-0.0.a1 From 25c03e08914a513e5f4add6ec2933db4d87dd54e Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Mon, 12 Aug 2024 21:15:43 -0300 Subject: [PATCH 3/6] Adding missing license --- .../perfsonar-host-metrics/LICENSE | 201 ++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/LICENSE b/perfsonar-host-metrics/perfsonar-host-metrics/LICENSE index e69de29..261eeb9 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/LICENSE +++ b/perfsonar-host-metrics/perfsonar-host-metrics/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From b2ffe0d53a6c1525a76bce782ace0e4094005ec6 Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Tue, 13 Aug 2024 23:30:19 -0300 Subject: [PATCH 4/6] Adding missing requirements to rpm spec file --- .../unibuild-packaging/rpm/perfsonar-host-metrics.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec index d277eb3..15fde53 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/rpm/perfsonar-host-metrics.spec @@ -52,8 +52,11 @@ Requires: prometheus-node-exporter Requires: %{_python}-perfsonar-psconfig Requires: %{_python}-pscheduler Requires: %{_python}-requests +Requires: python3 +Requires: python3-flask Requires: httpd Requires: mod_ssl +Requires: mod_wsgi > 4.0 Requires: selinux-policy-%{selinuxtype} Requires(post): selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel @@ -81,6 +84,7 @@ mv selinux/*.pp %{buildroot}/usr/share/selinux/packages/ rm -rf %{buildroot} %post +# This link is necessary because the WSGI script imports the application using a path relative to the WSGI config directory. ln -sT -f %{pkg_install_base} %{wsgi_config_base}/host_exporter #selinux From 24da3c8033dce83ff7a7f4b826fd23cb662b7d5f Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Tue, 13 Aug 2024 23:32:47 -0300 Subject: [PATCH 5/6] Updating deb packaging files --- .../unibuild-packaging/deb/control | 2 +- .../deb/perfsonar-host-metrics.install | 4 ++-- .../deb/perfsonar-host-metrics.postinst | 6 ++++-- .../deb/perfsonar-host-metrics.prerm | 21 +++++++++++++++++++ 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.prerm diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/control b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/control index 084a15d..f975fb1 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/control +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/control @@ -10,7 +10,7 @@ Package: perfsonar-host-metrics Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, prometheus-node-exporter, openssl, apache2, apache2-ssl-dev, perfsonar-common, python3-perfsonar-psconfig, - python3-pscheduler + python3-pscheduler, python3, python3-flask, libapache2-mod-wsgi-py3 Description: Prometheus node-exporter integration with perfSONAR A package that installs and sets-up Prometheus node_exporter for a perfSONAR to collect and report host metrics. diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.install b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.install index e01cf0c..6d22aa3 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.install +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.install @@ -1,5 +1,5 @@ apache-node_exporter.conf /etc/apache2/conf-available/ apache-perfsonar_host_exporter.conf /etc/apache2/conf-available/ exporter_opts.sh /usr/lib/perfsonar/host_metrics/ -perfsonar_host_exporter /usr/lib/perfsonar/host_metrics/ -perfsonar-host-exporter.service lib/systemd/system/ \ No newline at end of file +perfsonar_host_exporter.py /usr/lib/perfsonar/host_metrics/ +host_exporter.wsgi /var/www/html/perfsonar/host_exporter \ No newline at end of file diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst index ce11868..670d535 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst @@ -7,6 +7,8 @@ set -e case "$1" in configure) + # This link is necessary because the WSGI script imports the application using a path relative to the WSGI config directory. + ln -sT -f /usr/lib/perfsonar/host_metrics/ /var/www/html/perfsonar/host_exporter/host_exporter # check if installation or update, where version is a parameter chmod 755 /usr/lib/perfsonar/host_metrics/perfsonar_host_exporter #set node_exporter opts @@ -16,9 +18,8 @@ case "$1" in systemctl daemon-reload || : systemctl enable node_exporter.service || : systemctl restart node_exporter.service || : - systemctl enable perfsonar-host-exporter.service || : - systemctl restart perfsonar-host-exporter.service || : + # Enable and restart apache for wsgi and reverse proxy # Apache setup if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then . /usr/share/apache2/apache2-maintscript-helper @@ -27,6 +28,7 @@ case "$1" in apache2_invoke ensite default-ssl apache2_invoke enmod proxy apache2_invoke enmod proxy_http + apache2_invoke enconf mod-wsgi apache2_invoke enconf apache-node_exporter apache2_invoke enconf apache-perfsonar_host_exporter fi diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.prerm b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.prerm new file mode 100644 index 0000000..b8102cf --- /dev/null +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.prerm @@ -0,0 +1,21 @@ +#!/bin/sh +# prerm script for perfsonar host metrics +# +# see: dh_installdeb(1) + +set -e + + +case "$1" in + remove|upgrade|deconfigure) + if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke disconf apache-node_exporter + apache2_invoke disconf apache-perfsonar_host_exporter + fi + + rm -f /var/www/html/perfsonar/host_exporter/host_exporter + ;; +esac + +exit 0 \ No newline at end of file From 69c06e0421b0b84076af9923880d3de4bcc04878 Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Mon, 19 Aug 2024 23:54:18 -0300 Subject: [PATCH 6/6] Fixing deb packaging file --- .../unibuild-packaging/deb/perfsonar-host-metrics.postinst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst index 670d535..a3071ab 100644 --- a/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst +++ b/perfsonar-host-metrics/perfsonar-host-metrics/unibuild-packaging/deb/perfsonar-host-metrics.postinst @@ -10,7 +10,7 @@ case "$1" in # This link is necessary because the WSGI script imports the application using a path relative to the WSGI config directory. ln -sT -f /usr/lib/perfsonar/host_metrics/ /var/www/html/perfsonar/host_exporter/host_exporter # check if installation or update, where version is a parameter - chmod 755 /usr/lib/perfsonar/host_metrics/perfsonar_host_exporter + chmod 755 /usr/lib/perfsonar/host_metrics/perfsonar_host_exporter.py #set node_exporter opts bash /usr/lib/perfsonar/host_metrics/exporter_opts.sh if [ -z "$2" ]; then @@ -28,7 +28,6 @@ case "$1" in apache2_invoke ensite default-ssl apache2_invoke enmod proxy apache2_invoke enmod proxy_http - apache2_invoke enconf mod-wsgi apache2_invoke enconf apache-node_exporter apache2_invoke enconf apache-perfsonar_host_exporter fi