fix: tidy up missing metrics for exporter (OpenAtomFoundation#1753)

tidy up missing metrics for exporter Fixes: OpenAtomFoundation#1744 Signed-off-by: yaoyinnan <[email protected]>
AlexStocks · Jul 18, 2023 · 294e702 · 294e702
1 parent 4821991
commit 294e702
Show file tree

Hide file tree

Showing 9 changed files with 425 additions and 811 deletions.
diff --git a/tools/pika_exporter/contrib/base_info.png b/tools/pika_exporter/contrib/base_info.png
diff --git a/tools/pika_exporter/contrib/replication.png b/tools/pika_exporter/contrib/replication.png
diff --git a/tools/pika_exporter/contrib/rocksdb.png b/tools/pika_exporter/contrib/rocksdb.png
diff --git a/tools/pika_exporter/exporter/metrics/binlog.go b/tools/pika_exporter/exporter/metrics/binlog.go
@@ -7,17 +7,6 @@ func init() {
 }
 
 var collectBinlogMetrics = map[string]MetricConfig{
-	"binlog_log_size": {
-		Parser: &normalParser{},
-		MetricMeta: &MetaData{
-			Name:      "log_size",
-			Help:      "pika serve instance total binlog size in bytes",
-			Type:      metricTypeGauge,
-			Labels:    []string{LabelNameAddr, LabelNameAlias},
-			ValueName: "log_size",
-		},
-	},
-
 	"binlog_<3.1.0": {
 		Parser: &versionMatchParser{
 			verC: mustNewVersionConstraint(`<3.1.0`),
@@ -85,7 +74,7 @@ var collectBinlogMetrics = map[string]MetricConfig{
 	"consensus_last_log": {
 		Parser: Parsers{
 			&versionMatchParser{
-				verC: mustNewVersionConstraint(`>3.4.0`),
+				verC: mustNewVersionConstraint(`>3.4.0,<3.5.0`),
 				Parser: &regexParser{
 					name:   "consensus_last_log",
 					reg:    regexp.MustCompile(`(?P<consensus>consensus)\s*last_log=(?P<consensus_last_log>[^\s\r\n]*)`),

diff --git a/tools/pika_exporter/exporter/metrics/data.go b/tools/pika_exporter/exporter/metrics/data.go
@@ -15,6 +15,16 @@ var collectDataMetrics = map[string]MetricConfig{
 			ValueName: "db_size",
 		},
 	},
+    "log_size": {
+        Parser: &normalParser{},
+        MetricMeta: &MetaData{
+            Name:      "log_size",
+            Help:      "pika serve instance total log size in bytes",
+            Type:      metricTypeGauge,
+            Labels:    []string{LabelNameAddr, LabelNameAlias},
+            ValueName: "log_size",
+        },
+    },
 	"used_memory": {
 		Parser: &normalParser{},
 		MetricMeta: &MetaData{

diff --git a/tools/pika_exporter/exporter/metrics/replication.go b/tools/pika_exporter/exporter/metrics/replication.go
@@ -101,7 +101,7 @@ var collectReplicationMetrics = map[string]MetricConfig{
 				Name:      "slave_lag",
 				Help:      "pika serve instance slave's slot binlog lag",
 				Type:      metricTypeGauge,
-				Labels:    []string{LabelNameAddr, LabelNameAlias, "slave_conn_fd", "slave_ip", "slave_port", "slot"},
+				Labels:    []string{LabelNameAddr, LabelNameAlias, "slave_ip", "slave_port", "slave_conn_fd", "db"},
 				ValueName: "slave_lag",
 			},
 		},
@@ -115,7 +115,7 @@ var collectReplicationMetrics = map[string]MetricConfig{
 			},
 			Parser: Parsers{
 				&versionMatchParser{
-					verC: mustNewVersionConstraint(`>=3.4.0`),
+					verC: mustNewVersionConstraint(`>=3.4.0,<3.1.0`),
 					Parser: &regexParser{
 						name: "master_sharding_slave_info_slave_lag",
 						reg: regexp.MustCompile(`slave\d+:ip=(?P<slave_ip>[\d.]+),port=(?P<slave_port>[\d.]+),` +
@@ -129,7 +129,7 @@ var collectReplicationMetrics = map[string]MetricConfig{
 					},
 				},
 				&versionMatchParser{
-					verC: mustNewVersionConstraint(`>=3.4.0`),
+					verC: mustNewVersionConstraint(`>=3.4.0,<3.5.0`),
 					Parser: &regexParser{
 						name: "master_sharding_slave_info_slave_lag",
 						reg:  regexp.MustCompile(`db_repl_state:(?P<slave_lag>[^\r\n]*)`),
@@ -222,14 +222,14 @@ var collectReplicationMetrics = map[string]MetricConfig{
 		},
 	},
 
-	"sharding_slave_info>=3.4.0": {
+	"sharding_slave_info>=3.4.x,<3.5.0": {
 		Parser: &keyMatchParser{
 			matchers: map[string]Matcher{
 				"role":          &equalMatcher{v: "slave"},
 				"instance-mode": &equalMatcher{v: "sharding"},
 			},
 			Parser: &versionMatchParser{
-				verC:   mustNewVersionConstraint(`>=3.4.0`),
+				verC:   mustNewVersionConstraint(`>=3.4.x,<3.5.0`),
 				Parser: &normalParser{},
 			},
 		},
@@ -242,7 +242,7 @@ var collectReplicationMetrics = map[string]MetricConfig{
 		},
 	},
 
-	"double_master_info": {
+	"double_master_info<=3.4.2": {
 		Parser: &keyMatchParser{
 			matchers: map[string]Matcher{
 				"role":               &equalMatcher{v: "master"},

diff --git a/tools/pika_exporter/exporter/metrics/rocksdb.go b/tools/pika_exporter/exporter/metrics/rocksdb.go
@@ -145,6 +145,8 @@ var collectRocksDBMetrics = map[string]MetricConfig{
 	"size_all_mem_tables": {
 		Parser: &regexParser{
 			name:   "size_all_mem_tables",
+			// TODO: need fix size_all_mem_tables contains wrong data type starting with cur
+			// issue: https://github.com/OpenAtomFoundation/pika/issues/1752
 			reg:    regexp.MustCompile(`(?P<data_type>\w+)_.*?size_all_mem_tables:(?P<size_all_mem_tables>\d+)`),
 			Parser: &normalParser{},
 		},

diff --git a/tools/pika_exporter/exporter/metrics/server.go b/tools/pika_exporter/exporter/metrics/server.go
@@ -20,7 +20,7 @@ var collectServerMetrics = map[string]MetricConfig{
 			Name:   "server_info",
 			Help:   "pika serve instance info",
 			Type:   metricTypeGauge,
-			Labels: []string{LabelNameAddr, LabelNameAlias, "process_id", "tcp_port", "config_file", "server_id", "role"},
+			Labels: []string{LabelNameAddr, LabelNameAlias, "process_id", "tcp_port", "config_file", "server_id", "role", "run_id"},
 		},
 	},
 	"uptime_in_seconds": {