diff --git a/README.md b/README.md index 73a9446..0c93d45 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,7 @@ Currently it supports the following tests: - FedCloud Accounting Freshness - OCCI compute create - Perun + +This work is co-funded by the [EOSC-hub project](http://eosc-hub.eu/) (Horizon 2020) under Grant number 777536. + + diff --git a/nagios-plugins-fedcloud.spec b/nagios-plugins-fedcloud.spec index 8aebb1f..3684fb8 100644 --- a/nagios-plugins-fedcloud.spec +++ b/nagios-plugins-fedcloud.spec @@ -2,21 +2,26 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define dir /usr/libexec/argo-monitoring/probes/fedcloud -Summary: Nagios plugins for EGI FedCloud services -Name: nagios-plugins-fedcloud -Version: 0.5.0 -Release: 1%{?dist} -License: ASL 2.0 -Group: Network/Monitoring -Source0: %{name}-%{version}.tar.gz +Summary: Nagios plugins for EGI FedCloud services +Name: nagios-plugins-fedcloud +Version: 0.5.1 +Release: 1%{?dist} +License: ASL 2.0 +Group: Network/Monitoring +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -Requires: python >= 2.6 -Requires: python-argparse -Requires: python-requests -Requires: python2-ndg_httpsclient +Requires: python >= 2.6 +Requires: python-requests %description +%if 0%{?el7:1} +Requires: python-ndg_httpsclient +%else +Requires: python2-ndg_httpsclient +Requires: python-argparse +%endif + %prep %setup -q @@ -42,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Mar 31 2020 Daniel Vrcic - 0.5.1-1%{?dist} +- Fix perun.cesnet.cz address +- Add EOSC-hub acknowledgement +- vary spec dependency according to Centos version * Thu Oct 3 2019 Emir Imamagic - 0.5.0-1%{?dist} - Support for new version of cloudkeeper - Refactor authentication diff --git a/src/check_perun b/src/check_perun index 0828255..2e174be 100755 --- a/src/check_perun +++ b/src/check_perun @@ -22,7 +22,7 @@ KEY_PATH=/etc/nagios/globus/robokey.pem if [ "x$1" != "x" ]; then PERUN_URL_BASE=$1 else - PERUN_URL_BASE=https://perun.cesnet.cz/cert/rpc/ + PERUN_URL_BASE=https://perun.egi.eu/cert/rpc/ fi # Query Perun RPC