Skip to content

Commit 5463853

Browse files
slorello89slorello89
committed
more v1 cleanup
1 parent 8fdb384 commit 5463853

File tree

3 files changed

+38
-54
lines changed

3 files changed

+38
-54
lines changed

‎redis_enterprise_prometheus/README.md

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Agent Check: Redis Enterprise
1+
# Agent Check: Redis Enterprise Prometheus
22

33
## Overview
44

55
Redis is a fast, versatile data store that supports a variety of data structures, including strings, hashes, lists, sets, streams, and more. It also offers programmability, extensibility, persistence, clustering, and high availability. The community edition of Redis adds additional data models and capabilities, which include vector search, probabilistic data structures, JSON support, and full-text search.
66

7-
This integration works with on-premises and private cloud installations of [Redis Enterprise][1].
8-
The integration provides metrics for three critical cluster components: databases, nodes, and shards. This allows you to monitor database throughput, memory utilization, CPU usage, connection counts, replication health, and a variety of additional metrics within Datadog.
7+
This integration works with on-premises and private cloud installations of [Redis Enterprise][1] using Prometheus metrics.
8+
The integration provides metrics for four critical cluster components: clusters, databases, nodes, and shards. This allows you to monitor database throughput, memory utilization, CPU usage, connection counts, replication health, and a variety of additional metrics within Datadog.
99
You can use this information to understand the overall health of your Redis Enterprise clusters, diagnose application performance issues, and prevent downtime.
1010

1111
For a full list of supported metrics, see the [Metrics](#metrics) section below.
@@ -30,28 +30,35 @@ Set the `openmetrics_endpoint` to point to your cluster. See the [example][4]. L
3030

3131
There are two optional parameters: `extra_metrics` and `excluded_metrics`, as noted in the example configuration file.
3232

33-
The extra_metrics parameter takes a list of metric groups. The following are the available groups: RDSE.REPLICATION,
34-
RDSE.LISTENER, RDSE.PROXY, RDSE.BIGSTORE, RDSE.FLASH, RDSE.SHARDREPL. The default metrics groups RDSE.NODE,
35-
RDSE.DATABASE, and RDSE.SHARD are automatically inserted by the integration.
33+
The extra_metrics parameter takes a list of metric groups. The following are the available groups: REDIS2.REPLICATION,
34+
REDIS2.SHARDREPL, REDIS2.LDAP, REDIS2.NETWORK, REDIS2.MEMORY, REDIS2.X509, REDIS2.DISK, REDIS2.FILESYSTEM, REDIS2.PROCESS, REDIS2.PRESSURE, REDIS2.FLASH, REDIS2.SEARCH. The default metrics groups RDSE2.REDIS_CLUSTER,
35+
RDSE2.REDIS_DATABASE, RDSE2.REDIS_SHARD, RDSE2.REDIS_INFO, and RDSE2.REDIS_NODE are automatically inserted by the integration.
3636

3737
The exclude_metrics parameter takes a list of individual metrics to exclude, meaning that this information will not be
38-
passed on to Datadog. The individual metrics should be stripped of their prefix, e.g., 'rdse.bdb_up' would
39-
become 'bdb_up'. The full list of metrics is available on the 'Data Collected' tab of the integration page, or via the link in the [Metrics](#metrics) section.
40-
The following extra groups use the associated prefixes, which can be used to search for individual metrics on
38+
passed on to Datadog. The individual metrics should be stripped of their prefix, e.g., 'rdse2.generation' would
39+
become 'generation'. The full list of metrics is available on the 'Data Collected' tab of the integration page, or via the link in the [Metrics](#metrics) section.
40+
The following groups use the associated prefixes, which can be used to search for individual metrics on
4141
the data collected page.
4242

43-
| Group | Prefix | Notes |
44-
|------------------|-----------------------------|------------------------------------------------------|
45-
| RDSE.NODE | rdse.node_ | This will return bigstore and flash metrics as well |
46-
| RDSE.DATABASE | rdse.bdb_ | This will return replication metrics as well |
47-
| RDSE.SHARD | rdse.redis_ | This will return shard replication metrics as well |
48-
| RDSE.REPLICATION | rdse.bdb_crdt_ | |
49-
| RDSE.REPLICATION | rdse.bdb_replicaof_ | |
50-
| RDSE.SHARDREPL | rdse.redis_crdt_ | |
51-
| RDSE.PROXY | rdse.dmcproxy_ | |
52-
| RDSE.LISTENER | rdse.listener_ | |
53-
| RDSE.BIGSTORE | rdse.node_bigstore_ | |
54-
| RDSE.FLASH | rdse.node_available_flash | All flash metrics are of the form: rdse.node_*_flash |
43+
| Group | Prefix | Notes |
44+
|--------------------------|----------------------------|------------------------------------------------------|
45+
| RDSE2.REDIS_CLUSTER | rdse2. | Cluster-level metrics |
46+
| RDSE2.REDIS_DATABASE | rdse2.endpoint_ | Database endpoint metrics |
47+
| RDSE2.REDIS_SHARD | rdse2.redis_server_ | Shard-level Redis server metrics |
48+
| RDSE2.REDIS_NODE | rdse2.node_ | Node-level metrics including x509 certificates |
49+
| RDSE2.REDIS_INFO | rdse2.node_ | Node information metrics |
50+
| REDIS2.REPLICATION | rdse2.database_syncer_ | Database replication metrics |
51+
| REDIS2.SHARDREPL | rdse2.redis_crdt_ | Shard-level CRDT replication metrics |
52+
| REDIS2.LDAP | rdse2.directory_ | LDAP directory service metrics |
53+
| REDIS2.NETWORK | rdse2.node_network_ | Network interface metrics |
54+
| REDIS2.MEMORY | rdse2.node_memory_ | Memory usage metrics |
55+
| REDIS2.X509 | rdse2.x509_ | X509 certificate metrics |
56+
| REDIS2.DISK | rdse2.node_disk_ | Disk I/O metrics |
57+
| REDIS2.FILESYSTEM | rdse2.node_filesystem_ | Filesystem usage metrics |
58+
| REDIS2.PROCESS | rdse2.node_processes_ | Process metrics |
59+
| REDIS2.PRESSURE | rdse2.node_pressure_ | System pressure metrics |
60+
| REDIS2.FLASH | rdse2.node_*_flash | Flash storage metrics |
61+
| REDIS2.SEARCH | rdse2.redis_server_search_ | RediSearch module metrics |
5562

5663
### Validation
5764

@@ -63,8 +70,8 @@ or `curl -k <endpoint>` to ensure that you can receive metrics.
6370

6471
## Data Collected
6572

66-
The current release gathers all metrics for databases, nodes, and shards. Optionally, via the extra_metrics parameter,
67-
data for replication, proxy, listener, etc. can be gathered; see the list in the [Configuration](#configuration) section.
73+
The current release gathers all metrics for clusters, databases, nodes, and shards. By default, it collects metrics from the following groups: RDSE2.REDIS_CLUSTER, RDSE2.REDIS_DATABASE, RDSE2.REDIS_SHARD, RDSE2.REDIS_NODE, and RDSE2.REDIS_INFO. Optionally, via the extra_metrics parameter,
74+
data for replication, LDAP, network, memory, X509 certificates, disk, filesystem, processes, pressure, flash storage, and search can be gathered; see the list in the [Configuration](#configuration) section.
6875

6976

7077
### Metrics

‎redis_enterprise_prometheus/assets/dashboards/redis_enterprise-prometheus_node.json

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -797,12 +797,12 @@
797797
{
798798
"data_source": "metrics",
799799
"name": "query1",
800-
"query": "avg:rdse.node_cpu_user{$cluster, $node}"
800+
"query": "avg:rdse2.node_cpu_seconds_total.count{cluster:$cluster, node:$node, mode:user}.as_rate()"
801801
},
802802
{
803803
"data_source": "metrics",
804804
"name": "query2",
805-
"query": "avg:rdse.node_cpu_system{$cluster, $node}"
805+
"query": "avg:rdse2.node_cpu_seconds_total.count{$cluster, $node,mode:system}.as_rate()"
806806
}
807807
],
808808
"response_format": "timeseries",
@@ -880,22 +880,22 @@
880880
{
881881
"data_source": "metrics",
882882
"name": "query1",
883-
"query": "sum:rdse.redis_db0_keys{$cluster, $node} by {redis}"
883+
"query": "sum:rdse2.redis_server_db0_keys{$cluster, $node} by {redis}"
884884
},
885885
{
886886
"data_source": "metrics",
887887
"name": "query2",
888-
"query": "sum:rdse.redis_db0_expires{$cluster, $node} by {redis}"
888+
"query": "sum:rdse2.redis_server_expired_keys{$cluster, $node} by {redis}"
889889
},
890890
{
891891
"data_source": "metrics",
892892
"name": "query3",
893-
"query": "sum:rdse.redis_keys_trimmed{$cluster, $node} by {redis}"
893+
"query": "sum:rdse2.redis_server_keys_trimmed{$cluster, $node} by {redis}"
894894
},
895895
{
896896
"data_source": "metrics",
897897
"name": "query4",
898-
"query": "sum:rdse.redis_evicted_keys{$cluster, $node} by {redis}"
898+
"query": "sum:rdse2.redis_server_evicted_keys{$cluster, $node} by {redis}"
899899
}
900900
],
901901
"response_format": "timeseries",
@@ -905,22 +905,6 @@
905905
"line_width": "normal"
906906
},
907907
"display_type": "line"
908-
},
909-
{
910-
"formulas": [
911-
{
912-
"formula": "query1"
913-
}
914-
],
915-
"queries": [
916-
{
917-
"data_source": "metrics",
918-
"name": "query1",
919-
"query": "avg:rdse.node_total_req{*}"
920-
}
921-
],
922-
"response_format": "timeseries",
923-
"display_type": "overlay"
924908
}
925909
]
926910
},
@@ -972,12 +956,12 @@
972956
{
973957
"data_source": "metrics",
974958
"name": "query1",
975-
"query": "avg:rdse.redis_blocked_clients{$cluster, $node} by {redis}"
959+
"query": "avg:rdse2.redis_server_blocked_clients{$cluster, $node} by {redis}"
976960
},
977961
{
978962
"data_source": "metrics",
979963
"name": "query2",
980-
"query": "avg:rdse.redis_connected_clients{$cluster, $node} by {redis}"
964+
"query": "avg:rdse2.redis_server_connected_clients{$cluster, $node} by {redis}"
981965
}
982966
],
983967
"response_format": "timeseries",

‎redis_enterprise_prometheus/datadog_checks/redis_enterprise_prometheus/metrics.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@
99
# 'node_bigstore_kv_ops': {'name': 'node_bigstore_kv_ops', 'type': 'gauge'},
1010
# 'node_bigstore_throughput': {'name': 'node_bigstore_throughput', 'type': 'gauge'},
1111
# }
12-
#
13-
# REDIS_FLASH = {
14-
# 'node_available_flash': 'node_available_flash',
15-
# 'node_available_flash_no_overbooking': 'node_available_flash_no_overbooking',
16-
# 'node_provisional_flash': 'node_provisional_flash',
17-
# 'node_provisional_flash_no_overbooking': 'node_provisional_flash_no_overbooking',
18-
# }
1912

2013

2114
####### v2 #########

0 commit comments

Comments
 (0)