Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364206 )
Change subject: icinga: merge routers/switches monitoring groups
......................................................................
icinga: merge routers/switches monitoring groups
Merge the "routers" and "switches" monitoring groups into a single
"network" one and move all current checks in there. While at it, drop
the unused "storage" monitoring group.
Moreover, move the RIPE Atlas checks under the "network" group, as
they're clearly network-related checks.
Bug: T167279
Change-Id: Ie05f7538d469b112cf158287ef537d75d4e6da21
---
M hieradata/common/monitoring.yaml
M modules/netops/manifests/check.pp
M modules/netops/manifests/monitoring.pp
3 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index f60045d..2ee5e25 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -245,9 +245,5 @@
description: Management Interfaces
# Network
- routers:
- description: IP routers
- switches:
- description: IP switches
- storage:
- description: Storage equipment
+ network:
+ description: Networking equipment (routers/switches/etc.)
diff --git a/modules/netops/manifests/check.pp
b/modules/netops/manifests/check.pp
index 9dee5c7..e971e99 100644
--- a/modules/netops/manifests/check.pp
+++ b/modules/netops/manifests/check.pp
@@ -40,7 +40,7 @@
$ipv4,
$ipv6=undef,
$snmp_community=undef,
- $group='routers',
+ $group='network',
$alarms=false,
$bgp=false,
$interfaces=false,
diff --git a/modules/netops/manifests/monitoring.pp
b/modules/netops/manifests/monitoring.pp
index 5afc42f..75db5cf 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -14,7 +14,6 @@
# core/mgmt routers
$routers_defaults = {
snmp_community => $passwords::network::snmp_ro_community,
- group => 'routers',
alarms => true,
interfaces => true,
os => 'Junos',
@@ -58,7 +57,6 @@
# access/management/peering switches
$switches_defaults = {
snmp_community => $passwords::network::snmp_ro_community,
- group => 'switches',
alarms => true,
os => 'Junos',
}
--
To view, visit https://gerrit.wikimedia.org/r/364206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie05f7538d469b112cf158287ef537d75d4e6da21
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Ayounsi <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
