Skip to content

Commit

Permalink
Merge pull request #94 from stefanotorresi/fix/matching-labels-and-ca…
Browse files Browse the repository at this point in the history 
…se-sensitivity

Fix matching labels and case sensitivity
  • Loading branch information
@MalloZup
MalloZup authored Nov 14, 2019
2 parents 6800198 + 251c35a commit c5f4bd1
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion drbd_metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var (
drbdMetrics = metricDescriptors{
// the map key will function as an identifier of the metric throughout the rest of the code;
// it is arbitrary, but by convention we use the actual metric name
"resources": NewMetricDesc("drbd", "resources", "The DRBD resources; 1 line per name, per volume", []string{"name", "role", "volume", "disk_state"}),
"resources": NewMetricDesc("drbd", "resources", "The DRBD resources; 1 line per name, per volume", []string{"resource", "role", "volume", "disk_state"}),
"connections": NewMetricDesc("drbd", "connections", "The DRBD resource connections; 1 line per per resource, per peer_node_id", []string{"resource", "peer_node_id", "peer_role", "volume", "peer_disk_state"}),
"connections_sync": NewMetricDesc("drbd", "connections_sync", "The in sync percentage value for DRBD resource connections", []string{"resource", "peer_node_id", "volume"}),
}
Expand Down
6 changes: 3 additions & 3 deletions pacemaker_metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ var (
pacemakerMetrics = metricDescriptors{
// the map key will function as an identifier of the metric throughout the rest of the code;
// it is arbitrary, but by convention we use the actual metric name
"nodes": NewMetricDesc("pacemaker", "nodes", "The nodes in the cluster; one line per name, per status", []string{"name", "type", "status"}),
"nodes": NewMetricDesc("pacemaker", "nodes", "The nodes in the cluster; one line per name, per status", []string{"node", "type", "status"}),
"nodes_total": NewMetricDesc("pacemaker", "nodes_total", "Total number of nodes in the cluster", nil),
"resources": NewMetricDesc("pacemaker", "resources", "The resources in the cluster; one line per id, per status", []string{"node", "id", "role", "managed", "status"}),
"resources": NewMetricDesc("pacemaker", "resources", "The resources in the cluster; one line per id, per status", []string{"node", "resource", "role", "managed", "status"}),
"resources_total": NewMetricDesc("pacemaker", "resources_total", "Total number of resources in the cluster", nil),
"stonith_enabled": NewMetricDesc("pacemaker", "stonith_enabled", "Whether or not stonith is enabled", nil),
"fail_count": NewMetricDesc("pacemaker", "fail_count", "The Fail count number per node and resource id", []string{"node", "resource"}),
Expand Down Expand Up @@ -221,7 +221,7 @@ func (c *pacemakerCollector) recordResourcesMetrics(node node, ch chan<- prometh
"resources",
float64(1),
node.Name,
strings.ToLower(resource.ID),
resource.ID,
strings.ToLower(resource.Role),
strconv.FormatBool(resource.Managed),
resourceStatus)
Expand Down
4 changes: 2 additions & 2 deletions test/drbd.metrics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ ha_cluster_drbd_connections_sync{peer_node_id="1",resource="1-single-0",volume="
ha_cluster_drbd_connections_sync{peer_node_id="1",resource="1-single-1",volume="0"} 100 1234
# HELP ha_cluster_drbd_resources The DRBD resources; 1 line per name, per volume
# TYPE ha_cluster_drbd_resources gauge
ha_cluster_drbd_resources{disk_state="uptodate",name="1-single-0",role="Secondary",volume="0"} 1 1234
ha_cluster_drbd_resources{disk_state="uptodate",name="1-single-1",role="Secondary",volume="0"} 1 1234
ha_cluster_drbd_resources{disk_state="uptodate",resource="1-single-0",role="Secondary",volume="0"} 1 1234
ha_cluster_drbd_resources{disk_state="uptodate",resource="1-single-1",role="Secondary",volume="0"} 1 1234
22 changes: 11 additions & 11 deletions test/pacemaker.metrics
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ ha_cluster_pacemaker_migration_threshold{node="hana02",resource="rsc_SAPHanaTopo
ha_cluster_pacemaker_migration_threshold{node="hana02",resource="rsc_SAPHana_PRD_HDB00"} 50 1234
# HELP ha_cluster_pacemaker_nodes The nodes in the cluster; one line per name, per status
# TYPE ha_cluster_pacemaker_nodes gauge
ha_cluster_pacemaker_nodes{name="hana01",status="dc",type="member"} 1 1234
ha_cluster_pacemaker_nodes{name="hana01",status="expected_up",type="member"} 1 1234
ha_cluster_pacemaker_nodes{name="hana01",status="online",type="member"} 1 1234
ha_cluster_pacemaker_nodes{name="hana02",status="expected_up",type="member"} 1 1234
ha_cluster_pacemaker_nodes{name="hana02",status="online",type="member"} 1 1234
ha_cluster_pacemaker_nodes{node="hana01",status="dc",type="member"} 1 1234
ha_cluster_pacemaker_nodes{node="hana01",status="expected_up",type="member"} 1 1234
ha_cluster_pacemaker_nodes{node="hana01",status="online",type="member"} 1 1234
ha_cluster_pacemaker_nodes{node="hana02",status="expected_up",type="member"} 1 1234
ha_cluster_pacemaker_nodes{node="hana02",status="online",type="member"} 1 1234
# HELP ha_cluster_pacemaker_nodes_total Total number of nodes in the cluster
# TYPE ha_cluster_pacemaker_nodes_total gauge
ha_cluster_pacemaker_nodes_total 2 1234
# HELP ha_cluster_pacemaker_resources The resources in the cluster; one line per id, per status
# TYPE ha_cluster_pacemaker_resources gauge
ha_cluster_pacemaker_resources{id="rsc_ip_prd_hdb00",managed="true",node="hana01",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{id="rsc_saphana_prd_hdb00",managed="true",node="hana01",role="master",status="active"} 1 1234
ha_cluster_pacemaker_resources{id="rsc_saphana_prd_hdb00",managed="true",node="hana02",role="slave",status="active"} 1 1234
ha_cluster_pacemaker_resources{id="rsc_saphanatopology_prd_hdb00",managed="true",node="hana01",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{id="rsc_saphanatopology_prd_hdb00",managed="true",node="hana02",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{id="stonith-sbd",managed="true",node="hana01",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{managed="true",node="hana01",resource="rsc_ip_PRD_HDB00",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{managed="true",node="hana01",resource="rsc_SAPHana_PRD_HDB00",role="master",status="active"} 1 1234
ha_cluster_pacemaker_resources{managed="true",node="hana01",resource="rsc_SAPHanaTopology_PRD_HDB00",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{managed="true",node="hana01",resource="stonith-sbd",role="started",status="active"} 1 1234
ha_cluster_pacemaker_resources{managed="true",node="hana02",resource="rsc_SAPHana_PRD_HDB00",role="slave",status="active"} 1 1234
ha_cluster_pacemaker_resources{managed="true",node="hana02",resource="rsc_SAPHanaTopology_PRD_HDB00",role="started",status="active"} 1 1234
# HELP ha_cluster_pacemaker_resources_total Total number of resources in the cluster
# TYPE ha_cluster_pacemaker_resources_total gauge
ha_cluster_pacemaker_resources_total 6 1234
Expand Down

0 comments on commit c5f4bd1

Please sign in to comment.