Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/377823 )
Change subject: icinga: initial whitelist for screen monitoring
......................................................................
icinga: initial whitelist for screen monitoring
For upcoming monitoring of long-running screen sessions,
start whitelisting hosts where screens are expected and
there should not be any alerts.
In the original ticket it is already requested that terbium
and copper specifically are excluded.
But instead of doing it by hostname we should do it based on roles.
Based on mailing a few users using multiple screens, for
round 1 i came up with these roles to whitelist:
package building hosts (copper)
puppet masters (only frontend)
mariadb::core and all other mariadb::* roles (db*)
restbase-dev and restbase-test cluster (but not regular prod)
labtest* (various wmcs::openstack::labtest and ..::labtestn)
This is to be merged before we
enable the monitoring by default again and
is WIP, to be extended.
Bug: T165348
Change-Id: I8fc231cbcf2f607170467f9c99fd5cbf1a47c447
---
M hieradata/role/common/builder.yaml
A hieradata/role/common/mariadb/analytics.yaml
A hieradata/role/common/mariadb/client.yaml
A hieradata/role/common/mariadb/core.yaml
A hieradata/role/common/mariadb/dbstore.yaml
A hieradata/role/common/mariadb/dbstore_multiinstance.yaml
M hieradata/role/common/mariadb/labs_deprecated.yaml
A hieradata/role/common/mariadb/misc.yaml
A hieradata/role/common/mariadb/misc/eventlogging.yaml
A hieradata/role/common/mariadb/misc/phabricator.yaml
A hieradata/role/common/mariadb/otrsbackups.yaml
A hieradata/role/common/mariadb/parsercache.yaml
A hieradata/role/common/mariadb/sanitarium_multiinstance.yaml
A hieradata/role/common/mariadb/sanitarium_multisource.yaml
A hieradata/role/common/mariadb/tendril.yaml
M hieradata/role/common/puppetmaster/frontend.yaml
M hieradata/role/common/restbase/dev_cluster.yaml
M hieradata/role/common/restbase/test_cluster.yaml
18 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/builder.yaml
b/hieradata/role/common/builder.yaml
index d9dbac0..a2a0abf 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -6,3 +6,4 @@
profile::docker::storage::loopback::source_dir: "/srv/docker-dm"
profile::docker::builder::proxy_address: "webproxy.%{::site}.wmnet"
profile::docker::builder::proxy_port: "8080"
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/analytics.yaml
b/hieradata/role/common/mariadb/analytics.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/analytics.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/client.yaml
b/hieradata/role/common/mariadb/client.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/client.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/core.yaml
b/hieradata/role/common/mariadb/core.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/core.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/dbstore.yaml
b/hieradata/role/common/mariadb/dbstore.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/dbstore.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/dbstore_multiinstance.yaml
b/hieradata/role/common/mariadb/dbstore_multiinstance.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/dbstore_multiinstance.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/labs_deprecated.yaml
b/hieradata/role/common/mariadb/labs_deprecated.yaml
index 265476c..4bfa7b0 100644
--- a/hieradata/role/common/mariadb/labs_deprecated.yaml
+++ b/hieradata/role/common/mariadb/labs_deprecated.yaml
@@ -1,2 +1 @@
-admin::groups:
- - wmcs-admin
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/misc.yaml
b/hieradata/role/common/mariadb/misc.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/misc.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/misc/eventlogging.yaml
b/hieradata/role/common/mariadb/misc/eventlogging.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/misc/eventlogging.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/misc/phabricator.yaml
b/hieradata/role/common/mariadb/misc/phabricator.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/misc/phabricator.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/otrsbackups.yaml
b/hieradata/role/common/mariadb/otrsbackups.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/otrsbackups.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/parsercache.yaml
b/hieradata/role/common/mariadb/parsercache.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/parsercache.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/sanitarium_multiinstance.yaml
b/hieradata/role/common/mariadb/sanitarium_multiinstance.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/sanitarium_multiinstance.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/sanitarium_multisource.yaml
b/hieradata/role/common/mariadb/sanitarium_multisource.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/sanitarium_multisource.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/mariadb/tendril.yaml
b/hieradata/role/common/mariadb/tendril.yaml
new file mode 100644
index 0000000..4bfa7b0
--- /dev/null
+++ b/hieradata/role/common/mariadb/tendril.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/role/common/puppetmaster/frontend.yaml
b/hieradata/role/common/puppetmaster/frontend.yaml
index a65135f..d536678 100644
--- a/hieradata/role/common/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/puppetmaster/frontend.yaml
@@ -17,3 +17,4 @@
profile::discovery::watch_interval: 60
profile::puppetmaster::common::directory_environments: true
profile::puppetmaster::common::storeconfigs: puppetdb
+monitor_screens: false
diff --git a/hieradata/role/common/restbase/dev_cluster.yaml
b/hieradata/role/common/restbase/dev_cluster.yaml
index 25b274e..00ebff3 100644
--- a/hieradata/role/common/restbase/dev_cluster.yaml
+++ b/hieradata/role/common/restbase/dev_cluster.yaml
@@ -1,5 +1,6 @@
# We don't want paging
do_paging: false
+monitor_screens: false
#
# RESTBase
diff --git a/hieradata/role/common/restbase/test_cluster.yaml
b/hieradata/role/common/restbase/test_cluster.yaml
index 9b73a48..cb525f8 100644
--- a/hieradata/role/common/restbase/test_cluster.yaml
+++ b/hieradata/role/common/restbase/test_cluster.yaml
@@ -129,6 +129,8 @@
service::configuration::log_dir: "/var/log"
+monitor_screens: false
+
admin::groups:
- restbase-roots
- restbase-admins
--
To view, visit https://gerrit.wikimedia.org/r/377823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fc231cbcf2f607170467f9c99fd5cbf1a47c447
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
