SONAR-15688 fixed typo in web health metric

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricAction.java
index 29263a32a30959b7739fa6563e7b84eb57b6cb2c..d3a2f3fb500aa47c70dbe463b8c3b4b16339e1c9 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricAction.java
@@ -37,7 +37,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class SafeModeMonitoringMetricAction implements MonitoringWsAction {
 
-  protected static final Gauge isWebUpGauge = Gauge.build().name("sonarqube_heath_web_status")
+  protected static final Gauge isWebUpGauge = Gauge.build().name("sonarqube_health_web_status")
     .help("Tells whether Web process is up or down. 1 for up, 0 for down").register();
 
   private final SystemPasscode systemPasscode;

diff --git a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/monitoring/monitoring-metrics.txt b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/monitoring/monitoring-metrics.txt
index 15cff35ab9b8fe853fa9359683093cf750839a68..1a280ca0a955268a4e522d0d090d4ef1a9a51b2a 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/monitoring/monitoring-metrics.txt
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/monitoring/monitoring-metrics.txt
@@ -1,8 +1,8 @@
 # HELP sonarqube_compute_engine_tasks_running_duration_seconds Compute engine task running time in seconds
 # TYPE sonarqube_compute_engine_tasks_running_duration_seconds summary
-# HELP sonarqube_heath_elasticsearch_status Tells whether Elasticsearch is up or down. 1 for Up, 0 for down
-# TYPE sonarqube_heath_elasticsearch_status gauge
-sonarqube_heath_elasticsearch_status 1.0
+# HELP sonarqube_health_elasticsearch_status Tells whether Elasticsearch is up or down. 1 for Up, 0 for down
+# TYPE sonarqube_health_elasticsearch_status gauge
+sonarqube_health_elasticsearch_status 1.0
 # HELP sonarqube_health_integration_github_status Tells whether SonarQube instance has configured GitHub integration and its status is green. 1 for green, 0 otherwise .
 # TYPE sonarqube_health_integration_github_status gauge
 sonarqube_health_integration_github_status 0.0
@@ -15,12 +15,12 @@ sonarqube_health_integration_bitbucket_status 0.0
 # HELP sonarqube_health_integration_azuredevops_status Tells whether SonarQube instance has configured Azure integration and its status is green. 1 for green, 0 otherwise .
 # TYPE sonarqube_health_integration_azuredevops_status gauge
 sonarqube_health_integration_azuredevops_status 0.0
-# HELP sonarqube_heath_web_status Tells whether Web process is up or down. 1 for up, 0 for down
-# TYPE sonarqube_heath_web_status gauge
-sonarqube_heath_web_status 1.0
+# HELP sonarqube_health_web_status Tells whether Web process is up or down. 1 for up, 0 for down
+# TYPE sonarqube_health_web_status gauge
+sonarqube_health_web_status 1.0
 # HELP sonarqube_compute_engine_pending_tasks_total Number of tasks at given point of time that were pending in the Compute Engine queue [SHARED, same value for every SonarQube instance]
 # TYPE sonarqube_compute_engine_pending_tasks_total gauge
 sonarqube_compute_engine_pending_tasks_total 0.0
-# HELP sonarqube_heath_compute_engine_status Tells whether Compute Engine is up (healthy, ready to take tasks) or down. 1 for up, 0 for down
-# TYPE sonarqube_heath_compute_engine_status gauge
-sonarqube_heath_compute_engine_status 1.0
\ No newline at end of file
+# HELP sonarqube_health_compute_engine_status Tells whether Compute Engine is up (healthy, ready to take tasks) or down. 1 for up, 0 for down
+# TYPE sonarqube_health_compute_engine_status gauge
+sonarqube_health_compute_engine_status 1.0

diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/monitoring/MetricsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/monitoring/MetricsActionTest.java
index 82910285da0f459ee0a71c6cc8b81a5637ac270c..c308869a84a46a3db10ff3abef058966e158f580 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/monitoring/MetricsActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/monitoring/MetricsActionTest.java
@@ -86,9 +86,9 @@ public class MetricsActionTest {
     TestResponse response = ws.newRequest().execute();
     String content = response.getInput();
     assertThat(content)
-      .contains("# HELP sonarqube_heath_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
-      .contains("# TYPE sonarqube_heath_web_status gauge")
-      .contains("sonarqube_heath_web_status 1.0");
+      .contains("# HELP sonarqube_health_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
+      .contains("# TYPE sonarqube_health_web_status gauge")
+      .contains("sonarqube_health_web_status 1.0");
   }
 
   @Test
@@ -98,9 +98,9 @@ public class MetricsActionTest {
     TestResponse response = ws.newRequest().execute();
     String content = response.getInput();
     assertThat(content)
-      .contains("# HELP sonarqube_heath_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
-      .contains("# TYPE sonarqube_heath_web_status gauge")
-      .contains("sonarqube_heath_web_status 1.0");
+      .contains("# HELP sonarqube_health_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
+      .contains("# TYPE sonarqube_health_web_status gauge")
+      .contains("sonarqube_health_web_status 1.0");
   }
 
   @Test
@@ -110,9 +110,9 @@ public class MetricsActionTest {
     TestResponse response = ws.newRequest().execute();
     String content = response.getInput();
     assertThat(content)
-      .contains("# HELP sonarqube_heath_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
-      .contains("# TYPE sonarqube_heath_web_status gauge")
-      .contains("sonarqube_heath_web_status 1.0");
+      .contains("# HELP sonarqube_health_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
+      .contains("# TYPE sonarqube_health_web_status gauge")
+      .contains("sonarqube_health_web_status 1.0");
   }
 
 }

diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricActionTest.java
index e5c8cf443382fc7de26dd0995dba724858af8f91..278c118475c61d954b370154d2e4e65e2ec67aae 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SafeModeMonitoringMetricActionTest.java
@@ -76,9 +76,9 @@ public class SafeModeMonitoringMetricActionTest {
     TestResponse response = ws.newRequest().execute();
     String content = response.getInput();
     assertThat(content)
-      .contains("# HELP sonarqube_heath_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
-      .contains("# TYPE sonarqube_heath_web_status gauge")
-      .contains("sonarqube_heath_web_status 1.0");
+      .contains("# HELP sonarqube_health_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
+      .contains("# TYPE sonarqube_health_web_status gauge")
+      .contains("sonarqube_health_web_status 1.0");
   }
 
   @Test
@@ -88,9 +88,9 @@ public class SafeModeMonitoringMetricActionTest {
     TestResponse response = ws.newRequest().execute();
     String content = response.getInput();
     assertThat(content)
-      .contains("# HELP sonarqube_heath_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
-      .contains("# TYPE sonarqube_heath_web_status gauge")
-      .contains("sonarqube_heath_web_status 1.0");
+      .contains("# HELP sonarqube_health_web_status Tells whether Web process is up or down. 1 for up, 0 for down")
+      .contains("# TYPE sonarqube_health_web_status gauge")
+      .contains("sonarqube_health_web_status 1.0");
   }
 
   @Test