From 77ec4afa4ccb613c97bcfd015ec83b36bdb8b9e7 Mon Sep 17 00:00:00 2001 From: eimamagi Date: Mon, 8 Apr 2019 12:58:32 +0200 Subject: [PATCH 1/2] ARGO-1749 OCSP Nagios call should pass site name in metric result --- 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 0d6416f..2ae92c1 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$" --actual_data "$SERVICEPERFDATA$" + 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$" --site "$_SERVICESITE_NAME$" } define command { From 6ae655c97ff33df2e9e1c40518a6d6ca9b3821df Mon Sep 17 00:00:00 2001 From: eimamagi Date: Wed, 17 Apr 2019 14:47:20 +0200 Subject: [PATCH 2/2] Version bump. --- argo-ncg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argo-ncg.spec b/argo-ncg.spec index 852f2f5..ab7a9a4 100644 --- a/argo-ncg.spec +++ b/argo-ncg.spec @@ -5,7 +5,7 @@ Summary: ARGO Nagios config generator Name: argo-ncg -Version: 0.4.6 +Version: 0.4.7 Release: 1%{?dist} License: ASL 2.0 Group: Network/Monitoring