deposit: Migrate to static icinga checks
1 unresolved thread
1 unresolved thread
The same way we did for the webapp, we can no longer rely on puppet resource collection. So we explicit the icinga checks to install on the icinga node (pergamon).
No diff on moma (or deposit.internal.staging.swh.network)
swh-octo-diff pergamon
diff origin/production/pergamon.softwareheritage.org current/pergamon.softwareheritage.org
*******************************************
+ Concat::Fragment[icinga2::object::CheckCommand::production-check-deposit-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"production-check-deposit-cmd\" {\n impo...
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf"
*******************************************
+ Concat::Fragment[icinga2::object::CheckCommand::staging-check-deposit-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"staging-check-deposit-cmd\" {\n import ...
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf"
*******************************************
+ Concat::Fragment[icinga2::object::Host::archive-staging-rke2] =>
parameters =>
"content": "\nobject Host \"archive-staging-rke2\" {\n address = \"127.0.0....
"order": 50,
"target": "/etc/icinga2/conf.d/static-checks.conf"
*******************************************
- Concat::Fragment[icinga2::object::Host::swh-journal-client-staging]
*******************************************
- Concat::Fragment[icinga2::object::Host::virtual-swh-webapp-staging-node]
*******************************************
Concat::Fragment[icinga2::object::Service::Kafka swh.counters.journal_client lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.counters.journal_client lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.counters.journal_client lag"
*******************************************
Concat::Fragment[icinga2::object::Service::Kafka swh.scheduler.journal_client lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.scheduler.journal_client lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.scheduler.journal_client lag"
*******************************************
Concat::Fragment[icinga2::object::Service::Kafka swh.search.journal_client-v0.11 lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.search.journal_client-v0.11 lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.search.journal_client-v0.11 lag"
*******************************************
Concat::Fragment[icinga2::object::Service::Kafka swh.search.journal_client.indexed-v0.11 lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.search.journal_client.indexed-v0.11 lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.search.journal_client.indexed-v0.11 lag"
*******************************************
+ Concat::Fragment[icinga2::object::Service::production-check-deposit] =>
parameters =>
"content": "\nobject Service \"production Check deposit end-to-end\" {\n im...
"order": 60,
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf"
*******************************************
+ Concat::Fragment[icinga2::object::Service::staging-check-deposit] =>
parameters =>
"content": "\nobject Service \"staging Check deposit end-to-end\" {\n impor...
"order": 60,
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf"
*******************************************
+ Concat_fragment[icinga2::object::CheckCommand::production-check-deposit-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"production-check-deposit-cmd\" {\n impo...
"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-deposit-cmd] =>
parameters =>
"content": "\nobject CheckCommand \"staging-check-deposit-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::Host::archive-staging-rke2] =>
parameters =>
"content": "\nobject Host \"archive-staging-rke2\" {\n address = \"127.0.0....
"order": 50,
"tag": "_etc_icinga2_conf.d_static-checks.conf",
"target": "/etc/icinga2/conf.d/static-checks.conf"
*******************************************
- Concat_fragment[icinga2::object::Host::swh-journal-client-staging]
*******************************************
- Concat_fragment[icinga2::object::Host::virtual-swh-webapp-staging-node]
*******************************************
Concat_fragment[icinga2::object::Service::Kafka swh.counters.journal_client lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.counters.journal_client lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.counters.journal_client lag"
*******************************************
Concat_fragment[icinga2::object::Service::Kafka swh.scheduler.journal_client lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.scheduler.journal_client lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.scheduler.journal_client lag"
*******************************************
Concat_fragment[icinga2::object::Service::Kafka swh.search.journal_client-v0.11 lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.search.journal_client-v0.11 lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.search.journal_client-v0.11 lag"
*******************************************
Concat_fragment[icinga2::object::Service::Kafka swh.search.journal_client.indexed-v0.11 lag in staging] =>
parameters =>
content =>
@@ -1,5 +1,5 @@
_
object Service "Kafka swh.search.journal_client.indexed-v0.11 lag in staging" {
- host_name = "swh-journal-client-staging"
+ host_name = "archive-staging-rke2"
check_command = "check_prometheus_metric"
vars.prometheus_metric_name = "kafka swh.search.journal_client.indexed-v0.11 lag"
*******************************************
+ Concat_fragment[icinga2::object::Service::production-check-deposit] =>
parameters =>
"content": "\nobject Service \"production Check deposit end-to-end\" {\n im...
"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-deposit] =>
parameters =>
"content": "\nobject Service \"staging Check deposit end-to-end\" {\n impor...
"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 "y/9JijVs4ZcArnwOygXXjfRa5IgBAM2K71M7YewZpUqoieMDz7iWHHfhXta2ex/X/YDlIrKcSzNG/kmfFUB7RA==";
+ secret "y/OfxhQIkmCTCGBG0ozCSynUw+AwAr0ONKeujK2mfTqT7ucWf09ZDWT+uNdkSN6enzsGsTcFwmSq7Okty3Mtuw==";
};
*******************************************
File[/etc/bind/rndc.key] =>
parameters =>
content =>
@@ -2,4 +2,4 @@
key rndc-key {
algorithm hmac-md5;
- secret "fuF8c5YviqcR19FGvkTILyZuxU/chkJublaqWqtQ+VpZs9LtCp2X1Ny08pdkE3PlnKPCTB4uUkknLFUoes/AgA==";
+ secret "9hYkTuJnAtI2dMvLWJu1hgl6BfkRHfBjEaqlcgeXQJ2v8Mjdou9U3X0sBIAbao6aHJWk6rI7Tc2L6NJgzY9jng==";
};
*******************************************
+ Icinga2::Object::Checkcommand[production-check-deposit-cmd] =>
parameters =>
"checkcommand_name": "production-check-deposit-cmd",
"command": [
"/usr/bin/swh",
"icinga_plugins",
"--prometheus-exporter",
"--prometheus-exporter-directory",
"/var/lib/prometheus/node-exporter",
"--environment",
"production",
"--warning",
"600",
"--critical",
"3600",
"check-deposit",
"--server",
"https://deposit.softwareheritage.org/1",
"--username",
"swh",
"--password",
"swh-deploy-deposit-e2e-password",
"--collection",
"swh",
"--provider-url",
"https://www.softwareheritage.org",
"--swh-web-url",
"https://archive.softwareheritage.org",
"--poll-interval",
1,
"single",
"--archive",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz",
"--metadata",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"
],
"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-deposit-cmd] =>
parameters =>
"checkcommand_name": "staging-check-deposit-cmd",
"command": [
"/usr/bin/swh",
"icinga_plugins",
"--prometheus-exporter",
"--prometheus-exporter-directory",
"/var/lib/prometheus/node-exporter",
"--environment",
"staging",
"--warning",
"600",
"--critical",
"3600",
"check-deposit",
"--server",
"https://deposit.softwareheritage.org/1",
"--username",
"swh",
"--password",
"swh-deploy-deposit-e2e-password",
"--collection",
"swh",
"--provider-url",
"https://www.softwareheritage.org",
"--swh-web-url",
"https://archive.softwareheritage.org",
"--poll-interval",
1,
"single",
"--archive",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz",
"--metadata",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"
],
"ensure": "present",
"export_to": [
],
"import": [
"plugin-check-command"
],
"order": 15,
"target": "/etc/icinga2/conf.d/e2e-checks.conf",
"template": false,
"timeout": 4800
*******************************************
+ Icinga2::Object::Host[archive-staging-rke2] =>
parameters =>
"address": "127.0.0.1",
"check_command": "dummy",
"ensure": "present",
"export_to": [
],
"host_name": "archive-staging-rke2",
"import": [
],
"order": 50,
"target": "/etc/icinga2/conf.d/static-checks.conf",
"template": false,
"vars": {
"dummy_state": 0,
"dummy_text": "Virtual host for icinga checks related to staging services"...
}
*******************************************
- Icinga2::Object::Host[swh-journal-client-staging]
*******************************************
- Icinga2::Object::Host[virtual-swh-webapp-staging-node]
*******************************************
Icinga2::Object::Service[Kafka swh.counters.journal_client lag in staging] =>
parameters =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[Kafka swh.scheduler.journal_client lag in staging] =>
parameters =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[Kafka swh.search.journal_client-v0.11 lag in staging] =>
parameters =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[Kafka swh.search.journal_client.indexed-v0.11 lag in staging] =>
parameters =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
+ Icinga2::Object::Service[production-check-deposit] =>
parameters =>
"apply": false,
"assign": [
],
"check_command": "production-check-deposit-cmd",
"ensure": "present",
"export_to": [
],
"host_name": "pergamon.softwareheritage.org",
"ignore": [
],
"import": [
"generic-service-check-e2e"
],
"order": 60,
"prefix": false,
"service_name": "production Check deposit end-to-end",
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf",
"template": false
*******************************************
+ Icinga2::Object::Service[staging-check-deposit] =>
parameters =>
"apply": false,
"assign": [
],
"check_command": "staging-check-deposit-cmd",
"ensure": "present",
"export_to": [
],
"host_name": "pergamon.softwareheritage.org",
"ignore": [
],
"import": [
"generic-service-check-e2e"
],
"order": 60,
"prefix": false,
"service_name": "staging Check deposit end-to-end",
"target": "/etc/icinga2/zones.d/master/pergamon.softwareheritage.org.conf",
"template": false
*******************************************
+ Icinga2::Object::Service[swh-deposit api (remote on deposit.softwareheritage.org)] =>
parameters =>
"apply": false,
"assign": [
],
"check_command": "http",
"ensure": "present",
"export_to": [
"pergamon.softwareheritage.org"
],
"host_name": "deposit.softwareheritage.org",
"ignore": [
],
"import": [
"generic-service"
],
"order": 60,
"prefix": false,
"service_name": "swh-deposit api (remote)",
"target": "/etc/icinga2/zones.d/master/exported-checks.conf",
"template": false,
"vars": {
"http_port": 5006,
"http_uri": "/",
"http_string": "The Software Heritage Deposit"
}
*******************************************
+ Icinga2::Object::Service[swh-deposit api (remote on deposit.staging.swh.network)] =>
parameters =>
"apply": false,
"assign": [
],
"check_command": "http",
"ensure": "present",
"export_to": [
"pergamon.softwareheritage.org"
],
"host_name": "deposit.staging.swh.network",
"ignore": [
],
"import": [
"generic-service"
],
"order": 60,
"prefix": false,
"service_name": "swh-deposit api (remote)",
"target": "/etc/icinga2/zones.d/master/exported-checks.conf",
"template": false,
"vars": {
"http_port": 5006,
"http_uri": "/",
"http_string": "The Software Heritage Deposit"
}
*******************************************
Icinga2::Object::Service[swh-webapp content end to end for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp content_known for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp counters for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp directory end to end for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp graphql for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp release end to end for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp revision end to end for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp revision log end to end for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
Icinga2::Object::Service[swh-webapp snapshot end to end for webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
+ Icinga2::Object[icinga2::object::CheckCommand::production-check-deposit-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",
"600",
"--critical",
"3600",
"check-deposit",
"--server",
"https://deposit.softwareheritage.org/1",
"--username",
"swh",
"--password",
"swh-deploy-deposit-e2e-password",
"--collection",
"swh",
"--provider-url",
"https://www.softwareheritage.org",
"--swh-web-url",
"https://archive.softwareheritage.org",
"--poll-interval",
1,
"single",
"--archive",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz",
"--metadata",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"
],
"timeout": 4800
},
"attrs_list": [
"command",
"env",
"timeout",
"arguments",
"vars"
],
"ensure": "present",
"ignore": [
],
"import": [
"plugin-check-command"
],
"object_name": "production-check-deposit-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-deposit-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",
"600",
"--critical",
"3600",
"check-deposit",
"--server",
"https://deposit.softwareheritage.org/1",
"--username",
"swh",
"--password",
"swh-deploy-deposit-e2e-password",
"--collection",
"swh",
"--provider-url",
"https://www.softwareheritage.org",
"--swh-web-url",
"https://archive.softwareheritage.org",
"--poll-interval",
1,
"single",
"--archive",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz",
"--metadata",
"/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz.xml"
],
"timeout": 4800
},
"attrs_list": [
"command",
"env",
"timeout",
"arguments",
"vars"
],
"ensure": "present",
"ignore": [
],
"import": [
"plugin-check-command"
],
"object_name": "staging-check-deposit-cmd",
"object_type": "CheckCommand",
"order": 15,
"prefix": false,
"target": "/etc/icinga2/conf.d/e2e-checks.conf",
"template": false
*******************************************
+ Icinga2::Object[icinga2::object::Host::archive-staging-rke2] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"address": "127.0.0.1",
"check_command": "dummy",
"vars": {
"dummy_state": 0,
"dummy_text": "Virtual host for icinga checks related to staging service...
}
},
"attrs_list": [
"address",
"address6",
"groups",
"display_name",
"check_command",
"max_check_attempts",
"check_period",
"check_timeout",
"check_interval",
"retry_interval",
"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": [
],
"object_name": "archive-staging-rke2",
"object_type": "Host",
"order": 50,
"prefix": false,
"target": "/etc/icinga2/conf.d/static-checks.conf",
"template": false
*******************************************
- Icinga2::Object[icinga2::object::Host::swh-journal-client-staging]
*******************************************
- Icinga2::Object[icinga2::object::Host::virtual-swh-webapp-staging-node]
*******************************************
Icinga2::Object[icinga2::object::Service::Kafka swh.counters.journal_client lag in staging] =>
parameters =>
attrs =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
Icinga2::Object[icinga2::object::Service::Kafka swh.scheduler.journal_client lag in staging] =>
parameters =>
attrs =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
Icinga2::Object[icinga2::object::Service::Kafka swh.search.journal_client-v0.11 lag in staging] =>
parameters =>
attrs =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
Icinga2::Object[icinga2::object::Service::Kafka swh.search.journal_client.indexed-v0.11 lag in staging] =>
parameters =>
attrs =>
host_name =>
- swh-journal-client-staging
+ archive-staging-rke2
*******************************************
+ Icinga2::Object[icinga2::object::Service::production-check-deposit] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"host_name": "pergamon.softwareheritage.org",
"check_command": "production-check-deposit-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 deposit 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-deposit] =>
parameters =>
"apply": false,
"assign": [
],
"attrs": {
"host_name": "pergamon.softwareheritage.org",
"check_command": "staging-check-deposit-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 deposit 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_deposit[End-to-end Deposit Test(s) in production] =>
parameters =>
"deposit_archive": "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz...
"deposit_collection": "swh",
"deposit_metadata": "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tg...
"deposit_pass": "swh-deploy-deposit-e2e-password",
"deposit_poll_interval": 1,
"deposit_provider_url": "https://www.softwareheritage.org",
"deposit_server": "https://deposit.softwareheritage.org/1",
"deposit_swh_web_url": "https://archive.softwareheritage.org",
"deposit_user": "swh",
"environment": "production"
*******************************************
+ Profile::Icinga2::Objects::E2e_checks_deposit[End-to-end Deposit Test(s) in staging] =>
parameters =>
"deposit_archive": "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tgz...
"deposit_collection": "swh",
"deposit_metadata": "/usr/share/swh/icinga-plugins/data/deposit/jesuisgpl.tg...
"deposit_pass": "swh-deploy-deposit-e2e-password",
"deposit_poll_interval": 1,
"deposit_provider_url": "https://www.softwareheritage.org",
"deposit_server": "https://deposit.softwareheritage.org/1",
"deposit_swh_web_url": "https://archive.softwareheritage.org",
"deposit_user": "swh",
"environment": "staging"
*******************************************
+ Profile::Swh::Deploy::Deposit::Icinga_checks[deposit.softwareheritage.org] =>
parameters =>
"environment": "production",
"host_name": "moma.softwareheritage.org",
"vhost_name": "deposit.softwareheritage.org",
"vhost_ssl_port": 443
*******************************************
+ Profile::Swh::Deploy::Deposit::Icinga_checks[deposit.staging.swh.network] =>
parameters =>
"environment": "staging",
"host_name": "archive-staging-rke2",
"vhost_name": "deposit.staging.swh.network",
"vhost_ssl_port": 443
*******************************************
Profile::Swh::Deploy::Webapp::Icinga_checks[webapp.staging.swh.network] =>
parameters =>
host_name =>
- virtual-swh-webapp-staging-node
+ archive-staging-rke2
*******************************************
*** End octocatalog-diff on pergamon.softwareheritage.orgEdited by Antoine R. Dumont
Merge request reports
Activity
Filter activity
45 45 host_name => "virtual-swh-webapp-staging-node", 46 46 } 47 47 48 ::profile::swh::deploy::deposit::icinga_checks {'deposit.softwareheritage.org': 49 environment => "production", 50 host_name => "moma.softwareheritage.org", 51 } 52 53 ::icinga2::object::host {'virtual-swh-deposit-staging-node': changed this line in version 4 of the diff
In the next commit, i've renamed and refactored the multiple virtual hosts into one and named it 'archive-staging-rke2'. Then referenced that "virtual" node for the checks regarding webapp, deposit and journal-clients running in the related cluster.
Sounds like a better plan (thanks for your suggestion).
Edited by Antoine R. Dumont
added 2 commits
added 1 commit
- 80ca8b78 - static/icinga_checks: Use one virtual host archive-staging-rke2
mentioned in issue swh/infra/sysadm-environment#5129 (closed)
Please register or sign in to reply