SONAR-15688 fixing typos for some of the metrics and including new metric about web...

diff --git a/server/sonar-webserver-monitoring/src/main/java/org/sonar/server/monitoring/ServerMonitoringMetrics.java b/server/sonar-webserver-monitoring/src/main/java/org/sonar/server/monitoring/ServerMonitoringMetrics.java
index 82ed9dbd60aeb31b7a54cd2fed74e8b3dc24ccee..db0afbd2a6acbc120ebad4601aaccea07bef45ee 100644 (file)
--- a/server/sonar-webserver-monitoring/src/main/java/org/sonar/server/monitoring/ServerMonitoringMetrics.java
+++ b/server/sonar-webserver-monitoring/src/main/java/org/sonar/server/monitoring/ServerMonitoringMetrics.java
@@ -79,12 +79,12 @@ public class ServerMonitoringMetrics {
       .register();
 
     computeEngineGauge = Gauge.build()
-      .name("sonarqube_heath_compute_engine_status")
+      .name("sonarqube_health_compute_engine_status")
       .help("Tells whether Compute Engine is up (healthy, ready to take tasks) or down. 1 for up, 0 for down")
       .register();
 
     elasticsearchGauge = Gauge.build()
-      .name("sonarqube_heath_elasticsearch_status")
+      .name("sonarqube_health_elasticsearch_status")
       .help("Tells whether Elasticsearch is up or down. 1 for Up, 0 for down")
       .register();
 

diff --git a/server/sonar-webserver-monitoring/src/test/java/org/sonar/server/monitoring/ServerMonitoringMetricsTest.java b/server/sonar-webserver-monitoring/src/test/java/org/sonar/server/monitoring/ServerMonitoringMetricsTest.java
index 6d862b09dd14654afcdfedde5b3d9b9570665a69..3db9504b4f7fd46fab1de7228441a0bc74f2a99e 100644 (file)
--- a/server/sonar-webserver-monitoring/src/test/java/org/sonar/server/monitoring/ServerMonitoringMetricsTest.java
+++ b/server/sonar-webserver-monitoring/src/test/java/org/sonar/server/monitoring/ServerMonitoringMetricsTest.java
@@ -60,8 +60,8 @@ public class ServerMonitoringMetricsTest {
     assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_integration_gitlab_status")).isPositive();
     assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_integration_bitbucket_status")).isPositive();
     assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_integration_azuredevops_status")).isPositive();
-    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_heath_compute_engine_status")).isPositive();
-    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_heath_elasticsearch_status")).isPositive();
+    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_compute_engine_status")).isPositive();
+    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_elasticsearch_status")).isPositive();
   }
 
   @Test
@@ -79,8 +79,8 @@ public class ServerMonitoringMetricsTest {
     assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_integration_gitlab_status")).isZero();
     assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_integration_bitbucket_status")).isZero();
     assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_integration_azuredevops_status")).isZero();
-    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_heath_compute_engine_status")).isZero();
-    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_heath_elasticsearch_status")).isZero();
+    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_compute_engine_status")).isZero();
+    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_health_elasticsearch_status")).isZero();
   }
 
   @Test
@@ -119,6 +119,23 @@ public class ServerMonitoringMetricsTest {
       .isEqualTo(10);
   }
 
+  @Test
+  public void setters_setElasticsearchMetricsWithLabels() {
+    ServerMonitoringMetrics metrics = new ServerMonitoringMetrics();
+    String[] labelNames = {"node_name"};
+    String[] labelValues = {"node_1"};
+
+    metrics.setElasticSearchDiskSpaceFreeBytes(labelValues[0], 30);
+    metrics.setElasticSearchDiskSpaceTotalBytes(labelValues[0], 30);
+
+    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_elasticsearch_disk_space_total_bytes",
+      labelNames, labelValues))
+      .isEqualTo(30);
+    assertThat(CollectorRegistry.defaultRegistry.getSampleValue("sonarqube_elasticsearch_disk_space_free_bytes",
+      labelNames, labelValues))
+      .isEqualTo(30);
+  }
+
   @Test
   public void observeComputeEngineTaskDurationTest() {
     ServerMonitoringMetrics metrics = new ServerMonitoringMetrics();

diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 17566876094137f49bbb9b587b357900c84f8c34..d2317467a1ea0b0a50ff5ba7b111c0330b9da1a6 100644 (file)
--- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -131,6 +131,7 @@ import org.sonar.server.monitoring.ElasticSearchMetricTask;
 import org.sonar.server.monitoring.MainCollector;
 import org.sonar.server.monitoring.MonitoringWsModule;
 import org.sonar.server.monitoring.ServerMonitoringMetrics;
+import org.sonar.server.monitoring.WebUptimeTask;
 import org.sonar.server.monitoring.ce.NumberOfTasksInQueueTask;
 import org.sonar.server.monitoring.ce.RecentTasksDurationTask;
 import org.sonar.server.monitoring.devops.AzureMetricsTask;
@@ -597,6 +598,7 @@ public class PlatformLevel4 extends PlatformLevel {
 
       ComputeEngineMetricStatusTask.class,
       ElasticSearchMetricTask.class,
+      WebUptimeTask.class,
 
       MainCollector.class,