Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311754

Change subject: Follow-up I80040bee: Fix my order of parameters
......................................................................

Follow-up I80040bee: Fix my order of parameters

Change-Id: I383826059d55a2efb16b132566e32b49f9c204f8
---
M modules/beta/files/shinken.cfg
M modules/shinken/files/labs/basic-instance-checks.cfg
M modules/toollabs/files/shinken.cfg
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/311754/1

diff --git a/modules/beta/files/shinken.cfg b/modules/beta/files/shinken.cfg
index 7ac89ea..c53fbd4 100644
--- a/modules/beta/files/shinken.cfg
+++ b/modules/beta/files/shinken.cfg
@@ -66,12 +66,12 @@
     service_description         Long lived cherry-picks on puppetmaster
     hostgroup_name              role::beta::puppetmaster
     use                         generic-service
-    check_command               
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.CherryPickCounterCollector.cherrypicked_commits.ops-puppet!0!0!48h!100!0min!--over
+    check_command               
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.CherryPickCounterCollector.cherrypicked_commits.ops-puppet!0!0!48h!0min!100!--over
 }
 
 define service {
     service_description         Keyholder status
     hostgroup_name              role::deployment::server
     use                         generic-service
-    check_command               
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.NagiosCollector.keyholder_status!0!0!48h!100!0min!--over
+    check_command               
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.NagiosCollector.keyholder_status!0!0!48h!0min!100!--over
 }
diff --git a/modules/shinken/files/labs/basic-instance-checks.cfg 
b/modules/shinken/files/labs/basic-instance-checks.cfg
index 96aaf72..633bc52 100644
--- a/modules/shinken/files/labs/basic-instance-checks.cfg
+++ b/modules/shinken/files/labs/basic-instance-checks.cfg
@@ -4,7 +4,7 @@
 
 # Check that all mounts have at least 10% free space (for warn), 5% (for crit)
 define service {
-        check_command                  
check_graphite_series_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.diskspace.*.byte_percentfree!15!10!10min!1!0min!--under
 --allow-undefined
+        check_command                  
check_graphite_series_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.diskspace.*.byte_percentfree!15!10!10min!0min!1!--under
 --allow-undefined
         hostgroup_name                 role::labs::instance
         service_description            Free space - all mounts
         use                            generic-service
@@ -13,7 +13,7 @@
 
 # Check for puppet failure events
 define service {
-        check_command                  
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.failed_events!0!0!10min!1!0min!--over
+        check_command                  
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.failed_events!0!0!10min!0min!1!--over
         hostgroup_name                 role::labs::instance
         service_description            Puppet run
         use                            generic-service
@@ -42,7 +42,7 @@
 
 # Check for puppet staleness
 define service {
-        check_command                  
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.time_since_last_run!3600!43200!10min!1!0min!--over
+        check_command                  
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.puppetagent.time_since_last_run!3600!43200!10min!0min!1!--over
         hostgroup_name                 role::labs::instance
         service_description            Puppet staleness
         use                            generic-service
diff --git a/modules/toollabs/files/shinken.cfg 
b/modules/toollabs/files/shinken.cfg
index 1b0dc38..1b64b54 100644
--- a/modules/toollabs/files/shinken.cfg
+++ b/modules/toollabs/files/shinken.cfg
@@ -15,7 +15,7 @@
 
 # Check that no nodes have more than 50% iowait (warn) / 80% iowait (crit) for 
over 5 minutes
 define service {
-    check_command                  
check_graphite_series_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.cpu.total.iowait!50!80!10min!1!0min!--over
+    check_command                  
check_graphite_series_threshold!https://graphite-labs.wikimedia.org!10!$HOSTNOTES$.$HOSTNAME$.cpu.total.iowait!50!80!10min!0min!1!--over
     hostgroup_name                 tools
     service_description            High iowait
     use                            generic-service

-- 
To view, visit https://gerrit.wikimedia.org/r/311754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I383826059d55a2efb16b132566e32b49f9c204f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to