From 20223c5b279c4a582892afe65f571210fe64e151 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Wed, 28 Mar 2018 15:31:51 +0200 Subject: [PATCH 01/14] ARGO-1081 add support for basic-auth --- src/modules/NCG/SiteContacts/GOCDB.pm | 15 +++++++++++++-- src/modules/NCG/SiteInfo/GOCDB.pm | 14 ++++++++++++-- src/modules/NCG/SiteSet/GOCDB.pm | 15 +++++++++++++-- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/modules/NCG/SiteContacts/GOCDB.pm b/src/modules/NCG/SiteContacts/GOCDB.pm index 485e7a1..54b8959 100644 --- a/src/modules/NCG/SiteContacts/GOCDB.pm +++ b/src/modules/NCG/SiteContacts/GOCDB.pm @@ -141,6 +141,11 @@ sub getData { } my $req = HTTP::Request->new(GET => $url); + + if ( $self->{USERNAME} && $self->{PASSWORD} ) { + $req->authorization_basic($self->{USERNAME}, $self->{PASSWORD}); + } + my $res = $self->safeHTTPSCall($ua,$req); if (!$res->is_success) { $self->error("Could not get results from GOCDB: ".$res->status_line); @@ -209,8 +214,14 @@ can contains following elements: ROC - roc name must be set in case when CONTACT_TYPE is set to 'roc'. - TIMEOUT - HTTP timeout, - (default: DEFAULT_HTTP_TIMEOUT inherited from NCG) + TIMEOUT - HTTP timeout + - default: DEFAULT_HTTP_TIMEOUT inherited from NCG + + USERNAME - username for basic authentication + - default: undefined + + PASSWORD - password for basic authentication + - default: undefined =item C diff --git a/src/modules/NCG/SiteInfo/GOCDB.pm b/src/modules/NCG/SiteInfo/GOCDB.pm index 60773c9..c986d58 100644 --- a/src/modules/NCG/SiteInfo/GOCDB.pm +++ b/src/modules/NCG/SiteInfo/GOCDB.pm @@ -90,6 +90,10 @@ sub getData { } my $req = HTTP::Request->new(GET => $url); + if ( $self->{USERNAME} && $self->{PASSWORD} ) { + $req->authorization_basic($self->{USERNAME}, $self->{PASSWORD}); + } + my $res = $self->safeHTTPSCall($ua,$req); if (!$res->is_success) { $self->error("Could not get results from GOCDB: ".$res->status_line); @@ -267,8 +271,14 @@ can contains following elements: SCOPE - scope of services (for possible values see GOCDB documentation) - default: undefined - TIMEOUT - HTTP timeout, - (default: DEFAULT_HTTP_TIMEOUT inherited from NCG) + TIMEOUT - HTTP timeout + - default: DEFAULT_HTTP_TIMEOUT inherited from NCG + + USERNAME - username for basic authentication + - default: undefined + + PASSWORD - password for basic authentication + - default: undefined =back diff --git a/src/modules/NCG/SiteSet/GOCDB.pm b/src/modules/NCG/SiteSet/GOCDB.pm index 5bf8bf5..5abe8cc 100644 --- a/src/modules/NCG/SiteSet/GOCDB.pm +++ b/src/modules/NCG/SiteSet/GOCDB.pm @@ -111,6 +111,11 @@ sub getData } my $req = HTTP::Request->new(GET => $url); + + if ( $self->{USERNAME} && $self->{PASSWORD} ) { + $req->authorization_basic($self->{USERNAME}, $self->{PASSWORD}); + } + my $res = $self->safeHTTPSCall($ua,$req); if (!$res->is_success) { $self->error("Could not get results from GOCDB: ".$res->status_line); @@ -208,8 +213,14 @@ can contains following elements: SUBGRID_EXCLUDE - comma separated list of Subgrids to exclude. - TIMEOUT - HTTP timeout, - (default: DEFAULT_HTTP_TIMEOUT inherited from NCG) + TIMEOUT - HTTP timeout + - default: DEFAULT_HTTP_TIMEOUT inherited from NCG + + USERNAME - username for basic authentication + - default: undefined + + PASSWORD - password for basic authentication + - default: undefined =back From 9d6d157520400ca98ba0ddbd4e4b705d04ba5f7b Mon Sep 17 00:00:00 2001 From: eimamagi Date: Wed, 9 May 2018 10:36:01 +0200 Subject: [PATCH 02/14] ARGO-1109 Enable dpmt to monitoring engine --- src/ncg.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ncg.pl b/src/ncg.pl index a39f421..4330c35 100644 --- a/src/ncg.pl +++ b/src/ncg.pl @@ -262,8 +262,7 @@ sub getConfig { my %options = (-ConfigFile => $CONFIG_FILE, -AllowMultiOptions => 1, -InterPolateVars => 1, -InterPolateEnv => 1, -IncludeGlob => 1, -UseApacheInclude => 1, - -IncludeRelative => 1, -IncludeDirectories => 1, - -AutoTrue => 1); + -IncludeRelative => 1, -IncludeDirectories => 1); my $config = new Config::General(%options); if (!$config) { alarm(0); From 8e385dddfc61bc5f5e8381f7bbbd713c18874da8 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Tue, 22 May 2018 12:15:20 +0200 Subject: [PATCH 03/14] AO-323 ncg.reload.sh using wrong nagios path --- src/ncg.reload.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ncg.reload.sh b/src/ncg.reload.sh index 2955fc1..bb550bf 100644 --- a/src/ncg.reload.sh +++ b/src/ncg.reload.sh @@ -30,7 +30,7 @@ fi /usr/sbin/ncg.pl --timeout $NCG_TIMEOUT --output-dir=$OUTPUT_DIR_TMP --final-output-dir=/etc/nagios/argo-ncg.d $NCG_OPTIONS $NCG_BACKUP_OPTIONS || revert_config_and_exit sed "s|/etc/nagios/argo-ncg.d|$OUTPUT_DIR_TMP|" /etc/nagios/nagios.cfg > $CONFIG_FILE_TMP -/usr/bin/nagios -v $CONFIG_FILE_TMP || revert_config_and_exit +nagios -v $CONFIG_FILE_TMP || revert_config_and_exit # remove temp rm -rf $CONFIG_FILE_TMP @@ -41,9 +41,9 @@ mv /etc/nagios/argo-ncg.d /etc/nagios/argo-ncg.d.backup mv $OUTPUT_DIR_TMP /etc/nagios/argo-ncg.d if [ $NAGIOS_RUNNING -eq 1 ]; then - /sbin/service nagios reload + service nagios reload else # here we try to start nagios, continue running even if it fails echo "Nagios is not running, attempting to start it" - /sbin/service nagios start + service nagios start fi From 3abfd7e6c43405ad86add1e8535bb1e7ab6f93ca Mon Sep 17 00:00:00 2001 From: eimamagi Date: Mon, 11 Jun 2018 15:43:00 +0200 Subject: [PATCH 04/14] ARGO-1146 Nagios to send actual data --- config/templates/commands.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/templates/commands.template b/config/templates/commands.template index 6ba34e1..0d6416f 100644 --- a/config/templates/commands.template +++ b/config/templates/commands.template @@ -102,7 +102,7 @@ define command{ define command { command_name handle_service_check - command_line /usr/libexec/argo-msg-nagios/handle_service_check --role= --tenant= --send-to-msg= && /usr/bin/ams-metric-to-queue --queue /var/spool/argo-nagios-ams-publisher/metrics/ /var/spool/argo-nagios-ams-publisher/metricsdevel/ --service "$_SERVICESERVICE_FLAVOUR$" --hostname "$HOSTNAME$" --metric "$_SERVICEMETRIC_NAME$" --status "$SERVICESTATE$" --summary "$SERVICEOUTPUT$" --message "$LONGSERVICEOUTPUT$" --vofqan "$_SERVICEVO_FQAN$" --voname "$_SERVICEVO$" --roc "$_SERVICEROC$" --servicestatetype "$SERVICESTATETYPE$" + command_line /usr/libexec/argo-msg-nagios/handle_service_check --role= --tenant= --send-to-msg= && /usr/bin/ams-metric-to-queue --queue /var/spool/argo-nagios-ams-publisher/metrics/ /var/spool/argo-nagios-ams-publisher/metricsdevel/ --service "$_SERVICESERVICE_FLAVOUR$" --hostname "$HOSTNAME$" --metric "$_SERVICEMETRIC_NAME$" --status "$SERVICESTATE$" --summary "$SERVICEOUTPUT$" --message "$LONGSERVICEOUTPUT$" --vofqan "$_SERVICEVO_FQAN$" --voname "$_SERVICEVO$" --roc "$_SERVICEROC$" --servicestatetype "$SERVICESTATETYPE$" --actual_data "$SERVICEPERFDATA$" } define command { From b3269777d985f68f87c6b778fd304f72be6d7467 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Tue, 12 Jun 2018 08:02:27 +0200 Subject: [PATCH 05/14] ARGO-973 Monitoring for OCCI incorrectly rebuilds URL of service with port --- src/modules/NCG/LocalMetricsAttrs/Active.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/NCG/LocalMetricsAttrs/Active.pm b/src/modules/NCG/LocalMetricsAttrs/Active.pm index eafdc0a..247f039 100644 --- a/src/modules/NCG/LocalMetricsAttrs/Active.pm +++ b/src/modules/NCG/LocalMetricsAttrs/Active.pm @@ -379,6 +379,10 @@ sub _analyzeURLs { } if ($attr = $self->{SITEDB}->hostAttribute($hostname, "eu.egi.cloud.vm-management.occi_URL")) { + my $port; + if ($attr =~ /(\S+?:\/\/)?([-_.A-Za-z0-9]+):(\d+)/ ) { + $port = $3; + } eval {my $occiHash = {}; my $occiurl = url($attr); $self->{SITEDB}->hostAttribute($hostname, 'OCCI_PORT', $occiurl->port); @@ -392,7 +396,10 @@ sub _analyzeURLs { $occiHash->{$key} = $value; } $self->{SITEDB}->hostAttribute($hostname, 'OCCI_SCHEME', $occiurl->scheme); - $self->{SITEDB}->hostAttribute($hostname, 'OCCI_URL', $occiurl->scheme."://".$occiurl->host.":".$occiurl->port.$occiurl->epath); + my $occiurlAttr = $occiurl->scheme."://".$occiurl->host; + $occiurlAttr .= ":" . $port if ($port); + $occiurlAttr .= $occiurl->epath; + $self->{SITEDB}->hostAttribute($hostname, 'OCCI_URL', $occiurlAttr); if (!exists $occiHash->{OCCI_RESOURCE}) { if (!exists $occiHash->{OCCI_PLATFORM}) { $self->{SITEDB}->hostAttribute($hostname, 'OCCI_RESOURCE', 'small'); From 5af96300ca79e63cc4ff8f1066aad7cad203c089 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Tue, 12 Jun 2018 20:33:49 +0200 Subject: [PATCH 06/14] AO-356 Add dependancy to argo-ncg --- argo-ncg.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/argo-ncg.spec b/argo-ncg.spec index a53b29d..6796d61 100644 --- a/argo-ncg.spec +++ b/argo-ncg.spec @@ -14,6 +14,9 @@ Obsoletes: grid-monitoring-config-gen-nagios grid-monitoring-config-gen ncg-metr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: perl-libwww-perl > 5.833-2 +%if 0%{?el7:1} +Requires: perl(LWP::Protocol::https) +%endif %description (NULL) From 033e85a423b53e87cbb70b2f3411c45e26fbd56d Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 14 Jun 2018 09:33:54 +0200 Subject: [PATCH 07/14] ARGO-1247 ncg.reload.sh should clear hanging ncg.pl --- src/ncg.reload.sh | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/ncg.reload.sh b/src/ncg.reload.sh index bb550bf..c7a0e82 100644 --- a/src/ncg.reload.sh +++ b/src/ncg.reload.sh @@ -1,6 +1,5 @@ #!/bin/sh -NAGIOS_RUNNING=1 NCG_TIMEOUT=1800 OUTPUT_DIR_TMP=/etc/nagios/argo-ncg.d.tmp.$$ CONFIG_FILE_TMP=/etc/nagios/nagios.cfg.tmp.$$ @@ -20,12 +19,10 @@ revert_config_and_exit () { exit 1 } -# check if nagios is running at all -service nagios status 2>&1 > /dev/null -# status will return 1 if not running -if [ $? -ne 0 ]; then - NAGIOS_RUNNING=0 -fi +# kill all running ncg.pl instances +killall -9 ncg.pl +# clean any tmp generated by ncg.reload.sh +rm -rf /etc/nagios/argo-ncg.d.tmp.* /usr/sbin/ncg.pl --timeout $NCG_TIMEOUT --output-dir=$OUTPUT_DIR_TMP --final-output-dir=/etc/nagios/argo-ncg.d $NCG_OPTIONS $NCG_BACKUP_OPTIONS || revert_config_and_exit @@ -40,10 +37,6 @@ rm -rf /etc/nagios/argo-ncg.d.backup mv /etc/nagios/argo-ncg.d /etc/nagios/argo-ncg.d.backup mv $OUTPUT_DIR_TMP /etc/nagios/argo-ncg.d -if [ $NAGIOS_RUNNING -eq 1 ]; then - service nagios reload -else - # here we try to start nagios, continue running even if it fails - echo "Nagios is not running, attempting to start it" - service nagios start -fi +# Init script doesn't report status properly +# safer way is to restart +service nagios restart From dfac53790d0299e534eda0e6c1c2893155a2da5b Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 14 Jun 2018 15:20:46 +0200 Subject: [PATCH 08/14] AO-356 Add dependancy to argo-ncg --- argo-ncg.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/argo-ncg.spec b/argo-ncg.spec index 6796d61..661596a 100644 --- a/argo-ncg.spec +++ b/argo-ncg.spec @@ -14,6 +14,7 @@ Obsoletes: grid-monitoring-config-gen-nagios grid-monitoring-config-gen ncg-metr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: perl-libwww-perl > 5.833-2 +Requires: psmisc %if 0%{?el7:1} Requires: perl(LWP::Protocol::https) %endif From 5d277095dbde4952f8a60763ceab48b0ba4f3200 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 14 Jun 2018 19:33:23 +0200 Subject: [PATCH 09/14] AO-360 Propagate attributes from GOCDB extensions --- src/modules/NCG/SiteInfo/GOCDB.pm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/modules/NCG/SiteInfo/GOCDB.pm b/src/modules/NCG/SiteInfo/GOCDB.pm index c986d58..8a422be 100644 --- a/src/modules/NCG/SiteInfo/GOCDB.pm +++ b/src/modules/NCG/SiteInfo/GOCDB.pm @@ -212,6 +212,26 @@ sub getData { } } } + foreach $elem ($site->getElementsByTagName("EXTENSIONS")) { + foreach my $ext ($elem->getElementsByTagName("EXTENSION")) { + my ($elemInt, $keyInt, $valueInt); + foreach $elemInt ($ext->getElementsByTagName("KEY")) { + my $value = $elemInt->getFirstChild->getNodeValue(); + if ($value) { + $keyInt = $value; + } + } + foreach $elemInt ($ext->getElementsByTagName("VALUE")) { + my $value = $elemInt->getFirstChild->getNodeValue(); + if ($value) { + $valueInt = $value; + } + } + if ($keyInt && $valueInt) { + $self->{SITEDB}->hostAttribute($hostname, $keyInt, $valueInt); + } + } + } } if (!$self->{SITEDB}->siteCountry()) { From 3aac7568eb242f67d0931c9bd8ac9554dc67574c Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 14 Jun 2018 21:42:07 +0200 Subject: [PATCH 10/14] AO-331 Deploy ams-publisher Nagios sensor --- config/ncg-metric-config.d/argo.conf | 39 ++++++++++++++++++++++++++++ src/modules/NCG/LocalMetrics/Hash.pm | 14 +--------- 2 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 config/ncg-metric-config.d/argo.conf diff --git a/config/ncg-metric-config.d/argo.conf b/config/ncg-metric-config.d/argo.conf new file mode 100644 index 0000000..4d62a2c --- /dev/null +++ b/config/ncg-metric-config.d/argo.conf @@ -0,0 +1,39 @@ +{ + "argo.AMSPublisher-Check" : { + "parameter" : { + "-s" : "/var/run/argo-nagios-ams-publisher/sock", + "-q" : "'w:metrics+g:published360' -c 8000 -q 'w:alarms+g:published360' -c 1 -q 'w:metrics2+g:published360' -c 8000" + }, + "config" : { + "interval" : 360, + "maxCheckAttempts" : 1, + "path" : "/usr/libexec/argo-monitoring/probes/argo", + "retryInterval" : 1, + "timeout" : 120 + }, + "flags" : { + "NOHOSTNAME" : 1, + "NOTIMEOUT" : 1 + }, + "probe" : "ams-publisher-probe" + }, + "org.nagios.AmsDirSize" : { + "parameter" : { + "-d" : "/var/spool/argo-nagios-ams-publisher", + "-w" : 10000, + "-c" : 100000, + "-f" : 0, + }, + "config" : { + "interval" : 60, + "maxCheckAttempts" : 3, + "path" : "/usr/libexec/argo-monitoring/probes/nagiosexchange", + "retryInterval" : 5, + "timeout" : 15 + }, + "flags" : { + "NOHOSTNAME" : 1 + }, + "probe" : "check_dirsize.sh" + } +} diff --git a/src/modules/NCG/LocalMetrics/Hash.pm b/src/modules/NCG/LocalMetrics/Hash.pm index e60485c..995ea29 100644 --- a/src/modules/NCG/LocalMetrics/Hash.pm +++ b/src/modules/NCG/LocalMetrics/Hash.pm @@ -426,19 +426,6 @@ $WLCG_SERVICE->{'org.nagios.MsgDirSize'}->{parameter}->{'-w'} = '10000'; $WLCG_SERVICE->{'org.nagios.MsgDirSize'}->{parameter}->{'-c'} = '100000'; $WLCG_SERVICE->{'org.nagios.MsgDirSize'}->{parameter}->{'-f'} = ''; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{probe} = "check_dirsize.sh"; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{config}->{timeout} = 15; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{config}->{interval} = 60; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{config}->{retryInterval} = 5; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{config}->{maxCheckAttempts} = 3; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{config}->{path} = '/usr/libexec/argo-monitoring/probes/nagiosexchange'; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{flags}->{NOHOSTNAME} = 1; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{flags}->{PNP} = 1; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{parameter}->{'-d'} = '/var/spool/argo-nagios-ams-publisher'; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{parameter}->{'-w'} = '10000'; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{parameter}->{'-c'} = '100000'; -$WLCG_SERVICE->{'org.nagios.AmsDirSize'}->{parameter}->{'-f'} = ''; - $WLCG_SERVICE->{'org.nagios.ProcessMsgToHandler'}->{probe} = 'check_procs'; $WLCG_SERVICE->{'org.nagios.ProcessMsgToHandler'}->{config}->{path} = $NCG::NCG_PROBES_PATH_NAGIOS; $WLCG_SERVICE->{'org.nagios.ProcessMsgToHandler'}->{config}->{interval} = 15; @@ -602,6 +589,7 @@ $WLCG_NODETYPE->{internal}->{"NAGIOS"} = [ 'emi.wms.WMS-JobMonit', 'org.nordugrid.ARC-CE-monitor', 'org.nordugrid.ARC-CE-clean', +'argo.AMSPublisher-Check', ]; $WLCG_NODETYPE->{internal}->{"NRPE"} = [ From 9421e449f73b491e9f63efc1154fabc070971955 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 14 Jun 2018 21:46:45 +0200 Subject: [PATCH 11/14] AO-331 Deploy ams-publisher Nagios sensor --- config/ncg-metric-config.d/argo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ncg-metric-config.d/argo.conf b/config/ncg-metric-config.d/argo.conf index 4d62a2c..6ce621c 100644 --- a/config/ncg-metric-config.d/argo.conf +++ b/config/ncg-metric-config.d/argo.conf @@ -2,7 +2,7 @@ "argo.AMSPublisher-Check" : { "parameter" : { "-s" : "/var/run/argo-nagios-ams-publisher/sock", - "-q" : "'w:metrics+g:published360' -c 8000 -q 'w:alarms+g:published360' -c 1 -q 'w:metrics2+g:published360' -c 8000" + "-q" : "'w:metrics+g:published360' -c 8000 -q 'w:alarms+g:published360' -c 1 -q 'w:metricsdevel+g:published360' -c 8000" }, "config" : { "interval" : 360, From 5be47c50dd42cd398be7ac2b619c6c9431cf936d Mon Sep 17 00:00:00 2001 From: eimamagi Date: Thu, 14 Jun 2018 21:52:17 +0200 Subject: [PATCH 12/14] AO-331 Deploy ams-publisher Nagios sensor --- config/ncg-metric-config.d/argo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ncg-metric-config.d/argo.conf b/config/ncg-metric-config.d/argo.conf index 6ce621c..73dae46 100644 --- a/config/ncg-metric-config.d/argo.conf +++ b/config/ncg-metric-config.d/argo.conf @@ -22,7 +22,7 @@ "-d" : "/var/spool/argo-nagios-ams-publisher", "-w" : 10000, "-c" : 100000, - "-f" : 0, + "-f" : 0 }, "config" : { "interval" : 60, From ef0c7eae9549160ff79029fd8812020e3de801e0 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Tue, 19 Jun 2018 08:35:23 +0200 Subject: [PATCH 13/14] AO-363 Add eu.egi.sec.dCache-3.0 metric --- config/ncg-metric-config.d/midmon.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/config/ncg-metric-config.d/midmon.conf b/config/ncg-metric-config.d/midmon.conf index 16d0a50..46a536d 100644 --- a/config/ncg-metric-config.d/midmon.conf +++ b/config/ncg-metric-config.d/midmon.conf @@ -70,6 +70,30 @@ }, "probe" : "midmon/check_bdii_entries_num" }, + "eu.egi.sec.dCache-3.0" : { + "attribute" : { + "SITE_BDII" : "-H", + "BDII_PORT" : "-p" + }, + "parameter" : { + "-w" : "0:0", + "-f" : "\"(&(GlueSEImplementationName=dCache)(GlueSEImplementationVersion=3.0.*)(GlueSEUniqueID=*$HOSTNAME$*))\"", + "-b" : "O=grid" + }, + "flags" : { + "NOHOSTNAME" : 1, + "OBSESS" :1 + }, + "docurl" : "https://wiki.egi.eu/wiki/MW_Nagios_tests", + "config" : { + "maxCheckAttempts" : 1, + "timeout" : 120, + "path" : "/usr/libexec/argo-monitoring/probes", + "retryInterval" : 15, + "interval" : 1440 + }, + "probe" : "midmon/check_bdii_entries_num" + }, "org.bdii.GLUE2-Validate" : { "flags" : { "NRPE" : 1, From 558a57381b553f08a7e30766e5cb73e6b3e1779f Mon Sep 17 00:00:00 2001 From: eimamagi Date: Tue, 19 Jun 2018 08:36:56 +0200 Subject: [PATCH 14/14] Version bump. --- argo-ncg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argo-ncg.spec b/argo-ncg.spec index 661596a..c63c34c 100644 --- a/argo-ncg.spec +++ b/argo-ncg.spec @@ -5,7 +5,7 @@ Summary: ARGO Nagios config generator Name: argo-ncg -Version: 0.4.3 +Version: 0.4.4 Release: 1%{?dist} License: ASL 2.0 Group: Network/Monitoring