Monitoring first in Stacklight upgrade
- upgrade procedure may generate alerts
based on old Prometheus configuration
Change-Id: I20d038baf94d9c1f9095bc5bb7853ff74086b463
Related-bug: PROD-34923
diff --git a/stacklight-upgrade.groovy b/stacklight-upgrade.groovy
index 9b2d760..1e638fa 100644
--- a/stacklight-upgrade.groovy
+++ b/stacklight-upgrade.groovy
@@ -186,25 +186,6 @@
}
}
- if (STAGE_UPGRADE_SYSTEM_PART.toBoolean() == true && !errorOccured) {
- upgrade(pepperEnv, "I@telegraf:agent or I@telegraf:remote_agent", "telegraf", "telegraf", "telegraf")
- upgrade(pepperEnv, "I@fluentd:agent", "td-agent", "td-agent td-agent-additional-plugins", "fluentd")
- if (salt.testTarget(pepperEnv, "I@prometheus:relay")) {
- upgrade(pepperEnv, "I@prometheus:relay", "prometheus prometheus-relay", "prometheus-bin prometheus-relay", "prometheus")
- salt.runSaltProcessStep(pepperEnv, "I@prometheus:relay", "service.restart", "prometheus", null, true)
- }
- if (salt.testTarget(pepperEnv, "I@prometheus:exporters:libvirt")) {
- upgrade(pepperEnv, "I@prometheus:exporters:libvirt", "libvirt-exporter", "libvirt-exporter", "prometheus")
- }
- if (salt.testTarget(pepperEnv, "I@prometheus:exporters:jmx")) {
- upgrade(pepperEnv, "I@prometheus:exporters:jmx", "jmx-exporter", "jmx-exporter", "prometheus")
- }
- }
-
- if (STAGE_UPGRADE_ES_KIBANA.toBoolean() == true && !errorOccured) {
- upgrade_es_kibana(pepperEnv)
- }
-
if (STAGE_UPGRADE_DOCKER_COMPONENTS.toBoolean() == true && !errorOccured) {
stage('Upgrade docker components') {
try {
@@ -229,6 +210,25 @@
}
}
}
+
+ if (STAGE_UPGRADE_SYSTEM_PART.toBoolean() == true && !errorOccured) {
+ upgrade(pepperEnv, "I@telegraf:agent or I@telegraf:remote_agent", "telegraf", "telegraf", "telegraf")
+ upgrade(pepperEnv, "I@fluentd:agent", "td-agent", "td-agent td-agent-additional-plugins", "fluentd")
+ if (salt.testTarget(pepperEnv, "I@prometheus:relay")) {
+ upgrade(pepperEnv, "I@prometheus:relay", "prometheus prometheus-relay", "prometheus-bin prometheus-relay", "prometheus")
+ salt.runSaltProcessStep(pepperEnv, "I@prometheus:relay", "service.restart", "prometheus", null, true)
+ }
+ if (salt.testTarget(pepperEnv, "I@prometheus:exporters:libvirt")) {
+ upgrade(pepperEnv, "I@prometheus:exporters:libvirt", "libvirt-exporter", "libvirt-exporter", "prometheus")
+ }
+ if (salt.testTarget(pepperEnv, "I@prometheus:exporters:jmx")) {
+ upgrade(pepperEnv, "I@prometheus:exporters:jmx", "jmx-exporter", "jmx-exporter", "prometheus")
+ }
+ }
+
+ if (STAGE_UPGRADE_ES_KIBANA.toBoolean() == true && !errorOccured) {
+ upgrade_es_kibana(pepperEnv)
+ }
stage('Post upgrade steps') {
common.infoMsg('Apply workaround for PROD-33878')
salt.runSaltProcessStep(pepperEnv, "I@fluentd:agent and I@rabbitmq:server", "service.restart", "td-agent", null, true)