Merge pull request #100 from ARGOeu/devel

New Release
ARGOeu · Jan 29, 2020 · cb0edd4 · cb0edd4
2 parents a2ad69d + 428fa68
commit cb0edd4
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 581 deletions.
diff --git a/argo-ncg.spec b/argo-ncg.spec
@@ -5,7 +5,7 @@
 
 Summary: ARGO Nagios config generator
 Name: argo-ncg
-Version: 0.4.7
+Version: 0.4.8
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Network/Monitoring

diff --git a/config/templates/commands.template b/config/templates/commands.template
@@ -102,12 +102,12 @@ define command{
 
 define command {
         command_name handle_service_check
-        command_line /usr/libexec/argo-msg-nagios/handle_service_check  --role=<NAGIOS_ROLE> --tenant=<TENANT> --send-to-msg=<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$"
+        command_line /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 {
         command_name ncg-notify-by-msg
-        command_line /usr/libexec/argo-msg-nagios/handle_service_change  --role=<NAGIOS_ROLE> <SEND_TO_DASHBOARD> && /usr/bin/ams-alarm-to-queue --queue /var/spool/argo-nagios-ams-publisher/alarms --service "$_SERVICESERVICE_FLAVOUR$" --hostname "$HOSTNAME$" --testname "$_SERVICEMETRIC_NAME$" --status "$SERVICESTATE$" --details "$SERVICEOUTPUT$\n$LONGSERVICEOUTPUT$" --urlhelp "$SERVICENOTESURL$" --urlhistory "https://$_SERVICESERVER$/nagios/cgi-bin/status.cgi?host=$HOSTNAME$" --roc "$_SERVICEROC$" --site "$_SERVICESITE_NAME$"
+        command_line /usr/bin/ams-alarm-to-queue --queue /var/spool/argo-nagios-ams-publisher/alarms --service "$_SERVICESERVICE_FLAVOUR$" --hostname "$HOSTNAME$" --testname "$_SERVICEMETRIC_NAME$" --status "$SERVICESTATE$" --details "$SERVICEOUTPUT$\n$LONGSERVICEOUTPUT$" --urlhelp "$SERVICENOTESURL$" --urlhistory "https://$_SERVICESERVER$/nagios/cgi-bin/status.cgi?host=$HOSTNAME$" --roc "$_SERVICEROC$" --site "$_SERVICESITE_NAME$"
 }
 
 #####