From 1bdbf1a95cab594fb29c2d354f71f029e9c8624f Mon Sep 17 00:00:00 2001 From: Dustin Wilson <127760450+dwilsondo@users.noreply.github.com> Date: Thu, 9 May 2024 13:13:35 -0400 Subject: [PATCH] DBAAS: Include Additional Metrics OpenSearch + MySQL (#311) * include mysql repl. lag * include opensearch metrics * add os aggregations --- cmd/do-agent/aggregation.go | 35 +++++++++++++++++++++++++++++++ cmd/do-agent/whitelist.go | 42 ++++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/cmd/do-agent/aggregation.go b/cmd/do-agent/aggregation.go index b7d9a790..847a7fb0 100644 --- 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 index c009228a..c8664775 100644 --- 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, }