DBAAS: Include Additional Metrics OpenSearch + MySQL (#311)

* include mysql repl. lag * include opensearch metrics * add os aggregations
digitalocean · May 9, 2024 · 1bdbf1a · 1bdbf1a
1 parent edcf33a
commit 1bdbf1a
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 3 deletions.
diff --git a/cmd/do-agent/aggregation.go b/cmd/do-agent/aggregation.go
@@ -41,6 +41,41 @@ var dbaasAggregationSpec = map[string][]string{
 	"kafka_server_brokertopicmetrics_messagesinpersec_count":          {"topic"},
 	"kafka_server_brokertopicmetrics_replicationbytesinpersec_count":  {"topic"},
 	"kafka_server_brokertopicmetrics_replicationbytesoutpersec_count": {"topic"},
+
+	"opensearch_cluster_health_active_shards":         {"name"},
+	"opensearch_cluster_health_relocating_shards":     {"name"},
+	"opensearch_cluster_health_unassigned_shards":     {"name"},
+	"opensearch_cluster_health_number_of_nodes":       {"name"},
+	"opensearch_cluster_health_active_primary_shards": {"name"},
+
+	"opensearch_clusterstats_indices_count":               {"cluster_name"},
+	"opensearch_clusterstats_indices_store_size_in_bytes": {"cluster_name"},
+	"opensearch_clusterstats_indices_docs_count":          {"cluster_name"},
+	"opensearch_clusterstats_indices_docs_deleted":        {"cluster_name"},
+
+	"opensearch_indices_search_scroll_total":           {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_scroll_time_in_millis":  {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_query_total":            {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_query_time_in_millis":   {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_indexing_index_total":          {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_indexing_index_time_in_millis": {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_merges_total":                  {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_merges_total_time_in_millis":   {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_refresh_total":                 {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_refresh_total_time_in_millis":  {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_fetch_total":            {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_fetch_time_in_millis":   {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_suggest_total":          {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_search_suggest_time_in_millis": {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_query_cache_cache_size":        {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_query_cache_hit_count":         {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_query_cache_miss_count":        {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_indices_query_cache_evictions":         {"node_host", "node_attribute_zone", "cluster_name"},
+
+	"opensearch_jvm_mem_heap_used_in_bytes": {"node_host", "node_attribute_zone", "cluster_name"},
+	"opensearch_jvm_threads_count":          {"node_host", "node_attribute_zone", "cluster_name"},
+
+	"opensearch_http_total_opened": {"node_host", "node_attribute_zone", "cluster_name"},
 }
 
 var k8sAggregationSpec = map[string][]string{

diff --git a/cmd/do-agent/whitelist.go b/cmd/do-agent/whitelist.go
@@ -64,9 +64,10 @@ var dbaasWhitelist = map[string]bool{
 	"mysql_innodb_buffer_pool_read_requests": true,
 	"mysql_innodb_data_written":              true,
 
-	"mysql_questions":                true,
-	"mysql_slow_queries":             true,
-	"mysql_global_connection_memory": true,
+	"mysql_questions":                   true,
+	"mysql_slow_queries":                true,
+	"mysql_global_connection_memory":    true,
+	"mysql_slave_seconds_behind_master": true,
 
 	"redis_total_connections_received": true,
 	"redis_rejected_connections":       true,
@@ -110,4 +111,39 @@ var dbaasWhitelist = map[string]bool{
 	"kafka_controller_KafkaController_OfflinePartitionsCount_Value":         true,
 	"kafka_controller_KafkaController_PreferredReplicaImbalanceCount_Value": true,
 	"kafka_controller_ControllerStats_LeaderElectionRateAndTimeMs_Count":    true,
+
+	"opensearch_cluster_health_number_of_nodes":       true,
+	"opensearch_cluster_health_active_shards":         true,
+	"opensearch_cluster_health_relocating_shards":     true,
+	"opensearch_cluster_health_unassigned_shards":     true,
+	"opensearch_cluster_health_active_primary_shards": true,
+
+	"opensearch_clusterstats_indices_count":               true,
+	"opensearch_clusterstats_indices_store_size_in_bytes": true,
+	"opensearch_clusterstats_indices_docs_count":          true,
+	"opensearch_clusterstats_indices_docs_deleted":        true,
+
+	"opensearch_indices_search_scroll_total":           true,
+	"opensearch_indices_search_scroll_time_in_millis":  true,
+	"opensearch_indices_search_query_total":            true,
+	"opensearch_indices_search_query_time_in_millis":   true,
+	"opensearch_indices_indexing_index_total":          true,
+	"opensearch_indices_indexing_index_time_in_millis": true,
+	"opensearch_indices_merges_total":                  true,
+	"opensearch_indices_merges_total_time_in_millis":   true,
+	"opensearch_indices_refresh_total":                 true,
+	"opensearch_indices_refresh_total_time_in_millis":  true,
+	"opensearch_indices_search_fetch_total":            true,
+	"opensearch_indices_search_fetch_time_in_millis":   true,
+	"opensearch_indices_search_suggest_total":          true,
+	"opensearch_indices_search_suggest_time_in_millis": true,
+	"opensearch_indices_query_cache_cache_size":        true,
+	"opensearch_indices_query_cache_hit_count":         true,
+	"opensearch_indices_query_cache_miss_count":        true,
+	"opensearch_indices_query_cache_evictions":         true,
+
+	"opensearch_jvm_mem_heap_used_in_bytes": true,
+	"opensearch_jvm_threads_count":          true,
+
+	"opensearch_http_total_opened": true,
 }