icinga: Add static checks on dynamic vault instances
This was installed through puppet collection in the static infra. This can no longer be the case since it's running in the dynamic infra. So make it a static icinga checks to test both dynamic instance (1 for prod, another for staging).
swh-octodiff pergamon
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
+ Concat::Fragment[icinga2::object::CheckCommand::production-check-vault-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"production-check-vault-cmd\" {\n import...
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf"
*******************************************
+ Concat::Fragment[icinga2::object::CheckCommand::staging-check-vault-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"staging-check-vault-cmd\" {\n import \"...
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf"
*******************************************
+ Concat::Fragment[icinga2::object::Service::production-check-vault] =>
parameters =>
"content": "\nobject Service \"production Check vault end-to-end\" {\n impo...
"order": 60,
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf"
*******************************************
+ Concat::Fragment[icinga2::object::Service::staging-check-vault] =>
parameters =>
"content": "\nobject Service \"staging Check vault end-to-end\" {\n import ...
"order": 60,
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf"
*******************************************
+ Concat_fragment[icinga2::object::CheckCommand::production-check-vault-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"production-check-vault-cmd\" {\n import...
"order": 15,
"tag": "_etc_icinga2_conf.d_e2e-checks.conf",
"target": "/etc/icinga2/conf.d/e2e-checks.conf"
*******************************************
+ Concat_fragment[icinga2::object::CheckCommand::staging-check-vault-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"staging-check-vault-cmd\" {\n import \"...
"order": 15,
"tag": "_etc_icinga2_conf.d_e2e-checks.conf",
"target": "/etc/icinga2/conf.d/e2e-checks.conf"
*******************************************
+ Concat_fragment[icinga2::object::Service::production-check-vault] =>
parameters =>
"content": "\nobject Service \"production Check vault end-to-end\" {\n impo...
"order": 60,
"tag": "_etc_icinga2_zones.d_master_pergamon.softwareheritage.org.conf",
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf"
*******************************************
+ Concat_fragment[icinga2::object::Service::staging-check-vault] =>
parameters =>
"content": "\nobject Service \"staging Check vault end-to-end\" {\n import ...
"order": 60,
"tag": "_etc_icinga2_zones.d_master_pergamon.softwareheritage.org.conf",
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf"
*******************************************
File[/etc/bind/keys/local-update] =>
parameters =>
content =>
@@ -2,4 +2,4 @@
key local-update {
algorithm hmac-sha256;
- secret "Z4sbw6I4diiXQElkHOLS1wHL+iIz/1vLPmTXt6b9vEb58kyzLAfyPKpPHvbH+bjnf+Hci9CJPqo4HdtkBovDdw==";
+ secret "r4I2ma6iE2KsuRXQdqK4YISCEFyH5WPqy++ySzx+ty9lv2DCHsHJsDFlfGIfOE6/1DQxBONHKIcBes5CCo5cVg==";
};
*******************************************
File[/etc/bind/rndc.key] =>
parameters =>
content =>
@@ -2,4 +2,4 @@
key rndc-key {
algorithm hmac-md5;
- secret "u7ZI7Iu/5ezSMnki63VTpQ6iGv/9f2+LZKFSrTbnS9jk1yMZsZHPADnLKtAMZ831W6CI27Qv9JiQJX4M+7hX/Q==";
+ secret "t+AjPWlTIQy7R7OqOScl2DNFWpN8BQG4toGElWaBMruhWA4go345Y7qY+TI0THjnBw99LoZyR6/55Qbz00Fy4A==";
};
*******************************************
+ Icinga2::Object::Checkcommand[production-check-vault-cmd] =>
parameters =>
"checkcommand_name": "production-check-vault-cmd",
"command": [
"/usr/bin/swh",
"icinga_plugins",
"--prometheus-exporter",
"--prometheus-exporter-directory",
"/var/lib/prometheus/node-exporter",
"--environment",
"production",
"--warning",
"1200",
"--critical",
"3600",
"check-vault",
"--swh-storage-url",
"http://storage-postgresql-ro.internal.softwareheritage.org",
"--swh-web-url",
"https://archive.softwareheritage.org",
"directory"
],
"ensure": "present",
"export_to": [
],
"import": [
"plugin-check-command"
],
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf",
"template": false,
"timeout": 4800
*******************************************
+ Icinga2::Object::Checkcommand[staging-check-vault-cmd] =>
parameters =>
"checkcommand_name": "staging-check-vault-cmd",
"command": [
"/usr/bin/swh",
"icinga_plugins",
"--prometheus-exporter",
"--prometheus-exporter-directory",
"/var/lib/prometheus/node-exporter",
"--environment",
"staging",
"--warning",
"1200",
"--critical",
"3600",
"check-vault",
"--swh-storage-url",
"http://storage-ro.internal.staging.swh.network",
"--swh-web-url",
"https://webapp.staging.swh.network",
"directory"
],
"ensure": "present",
"export_to": [
],
"import": [
"plugin-check-command"
],
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf",
"template": false,
"timeout": 4800
*******************************************
+ Icinga2::Object::Service[production-check-vault] =>
parameters =>
"apply": false,
"assign": [
],
"check_command": "production-check-vault-cmd",
"ensure": "present",
"export_to": [
],
"host_name": "pergamon.softwareheritage.org",
"ignore": [
],
"import": [
"generic-service-check-e2e"
],
"order": 60,
"prefix": false,
"service_name": "production Check vault end-to-end",
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf",
"template": false
*******************************************
+ Icinga2::Object::Service[staging-check-vault] =>
parameters =>
"apply": false,
"assign": [
],
"check_command": "staging-check-vault-cmd",
"ensure": "present",
"export_to": [
],
"host_name": "pergamon.softwareheritage.org",
"ignore": [
],
"import": [
"generic-service-check-e2e"
],
"order": 60,
"prefix": false,
"service_name": "staging Check vault end-to-end",
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf",
"template": false
*******************************************
+ Icinga2::Object[icinga2::object::CheckCommand::production-check-vault-cmd] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"command": [
"/usr/bin/swh",
"icinga_plugins",
"--prometheus-exporter",
"--prometheus-exporter-directory",
"/var/lib/prometheus/node-exporter",
"--environment",
"production",
"--warning",
"1200",
"--critical",
"3600",
"check-vault",
"--swh-storage-url",
"http://storage-postgresql-ro.internal.softwareheritage.org",
"--swh-web-url",
"https://archive.softwareheritage.org",
"directory"
],
"timeout": 4800
},
"attrs_list": [
"command",
"env",
"timeout",
"arguments",
"vars"
],
"ensure": "present",
"ignore": [
],
"import": [
"plugin-check-command"
],
"object_name": "production-check-vault-cmd",
"object_type": "CheckCommand",
"order": 15,
"prefix": false,
"target": "/etc/icinga2/conf.d/e2e-checks.conf",
"template": false
*******************************************
+ Icinga2::Object[icinga2::object::CheckCommand::staging-check-vault-cmd] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"command": [
"/usr/bin/swh",
"icinga_plugins",
"--prometheus-exporter",
"--prometheus-exporter-directory",
"/var/lib/prometheus/node-exporter",
"--environment",
"staging",
"--warning",
"1200",
"--critical",
"3600",
"check-vault",
"--swh-storage-url",
"http://storage-ro.internal.staging.swh.network",
"--swh-web-url",
"https://webapp.staging.swh.network",
"directory"
],
"timeout": 4800
},
"attrs_list": [
"command",
"env",
"timeout",
"arguments",
"vars"
],
"ensure": "present",
"ignore": [
],
"import": [
"plugin-check-command"
],
"object_name": "staging-check-vault-cmd",
"object_type": "CheckCommand",
"order": 15,
"prefix": false,
"target": "/etc/icinga2/conf.d/e2e-checks.conf",
"template": false
*******************************************
+ Icinga2::Object[icinga2::object::Service::production-check-vault] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"host_name": "pergamon.softwareheritage.org",
"check_command": "production-check-vault-cmd"
},
"attrs_list": [
"display_name",
"host_name",
"check_command",
"check_timeout",
"check_interval",
"check_period",
"retry_interval",
"max_check_attempts",
"groups",
"enable_notifications",
"enable_active_checks",
"enable_passive_checks",
"enable_event_handler",
"enable_flapping",
"enable_perfdata",
"event_command",
"flapping_threshold_low",
"flapping_threshold_high",
"volatile",
"zone",
"command_endpoint",
"notes",
"notes_url",
"action_url",
"icon_image",
"icon_image_alt",
"vars"
],
"ensure": "present",
"ignore": [
],
"import": [
"generic-service-check-e2e"
],
"object_name": "production Check vault end-to-end",
"object_type": "Service",
"order": 60,
"prefix": false,
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf",
"template": false
*******************************************
+ Icinga2::Object[icinga2::object::Service::staging-check-vault] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"host_name": "pergamon.softwareheritage.org",
"check_command": "staging-check-vault-cmd"
},
"attrs_list": [
"display_name",
"host_name",
"check_command",
"check_timeout",
"check_interval",
"check_period",
"retry_interval",
"max_check_attempts",
"groups",
"enable_notifications",
"enable_active_checks",
"enable_passive_checks",
"enable_event_handler",
"enable_flapping",
"enable_perfdata",
"event_command",
"flapping_threshold_low",
"flapping_threshold_high",
"volatile",
"zone",
"command_endpoint",
"notes",
"notes_url",
"action_url",
"icon_image",
"icon_image_alt",
"vars"
],
"ensure": "present",
"ignore": [
],
"import": [
"generic-service-check-e2e"
],
"object_name": "staging Check vault end-to-end",
"object_type": "Service",
"order": 60,
"prefix": false,
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf",
"template": false
*******************************************
+ Profile::Icinga2::Objects::E2e_checks_vault[End-to-end Vault Test(s) in production] =>
parameters =>
"environment": "production",
"server_vault": "http://storage-postgresql-ro.internal.softwareheritage.org"...
"server_webapp": "https://archive.softwareheritage.org"
*******************************************
+ Profile::Icinga2::Objects::E2e_checks_vault[End-to-end Vault Test(s) in staging] =>
parameters =>
"environment": "staging",
"server_vault": "http://storage-ro.internal.staging.swh.network",
"server_webapp": "https://webapp.staging.swh.network"
*******************************************
+ Profile::Swh::Deploy::Vault::Icinga_checks[production] =>
parameters =>
"environment": "production",
"storage": "http://storage-postgresql-ro.internal.softwareheritage.org",
"webapp": "https://archive.softwareheritage.org"
*******************************************
+ Profile::Swh::Deploy::Vault::Icinga_checks[staging] =>
parameters =>
"environment": "staging",
"storage": "http://storage-ro.internal.staging.swh.network",
"webapp": "https://webapp.staging.swh.network"
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.org