Skip to content

Fix duplicate index throttling metric registration #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdtte wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix duplicate index throttling metric registration #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion collector/indices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ var (
indicesLabels, nil,
)
indicesIndexingIsThrottled = prometheus.NewDesc(
prometheus.BuildFQName(namespace, "indices", "indexing_is_throttled"),
prometheus.BuildFQName(namespace, "index_stats", "indexing_is_throttled"),
"Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)",
indicesLabels, nil,
)
Expand Down
54 changes: 27 additions & 27 deletions collector/indices_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ func TestIndices(t *testing.T) {
# TYPE elasticsearch_index_stats_indexing_delete_current gauge
elasticsearch_index_stats_indexing_delete_current{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_delete_current{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_indices_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_indices_indexing_is_throttled gauge
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_index_stats_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_index_stats_indexing_is_throttled gauge
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_index_stats_merge_auto_throttle_bytes_total Total bytes that were auto-throttled during merging
# TYPE elasticsearch_index_stats_merge_auto_throttle_bytes_total counter
elasticsearch_index_stats_merge_auto_throttle_bytes_total{cluster="unknown_cluster",index="foo_1"} 0
Expand Down Expand Up @@ -425,10 +425,10 @@ func TestIndices(t *testing.T) {
# TYPE elasticsearch_index_stats_indexing_index_failed_total counter
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_indices_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_indices_indexing_is_throttled gauge
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_index_stats_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_index_stats_indexing_is_throttled gauge
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_index_stats_merge_auto_throttle_bytes_total Total bytes that were auto-throttled during merging
# TYPE elasticsearch_index_stats_merge_auto_throttle_bytes_total counter
elasticsearch_index_stats_merge_auto_throttle_bytes_total{cluster="unknown_cluster",index="foo_1"} 1.048576e+08
Expand Down Expand Up @@ -789,13 +789,13 @@ func TestIndices(t *testing.T) {
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index=".watches"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_indices_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_indices_indexing_is_throttled gauge
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index=".monitoring-data-2"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index=".monitoring-es-2-2017.08.23"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index=".watches"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_index_stats_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_index_stats_indexing_is_throttled gauge
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index=".monitoring-data-2"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index=".monitoring-es-2-2017.08.23"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index=".watches"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
# HELP elasticsearch_index_stats_merge_auto_throttle_bytes_total Total bytes that were auto-throttled during merging
# TYPE elasticsearch_index_stats_merge_auto_throttle_bytes_total counter
elasticsearch_index_stats_merge_auto_throttle_bytes_total{cluster="unknown_cluster",index=".monitoring-data-2"} 2.097152e+07
Expand Down Expand Up @@ -1324,12 +1324,12 @@ func TestIndices(t *testing.T) {
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_2"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_3"} 0
# HELP elasticsearch_indices_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_indices_indexing_is_throttled gauge
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index=".geoip_databases"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_3"} 0
# HELP elasticsearch_index_stats_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_index_stats_indexing_is_throttled gauge
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index=".geoip_databases"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_3"} 0
# HELP elasticsearch_index_stats_merge_auto_throttle_bytes_total Total bytes that were auto-throttled during merging
# TYPE elasticsearch_index_stats_merge_auto_throttle_bytes_total counter
elasticsearch_index_stats_merge_auto_throttle_bytes_total{cluster="unknown_cluster",index=".geoip_databases"} 2.097152e+07
Expand Down Expand Up @@ -1797,12 +1797,12 @@ func TestIndices(t *testing.T) {
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_2"} 0
elasticsearch_index_stats_indexing_index_failed_total{cluster="unknown_cluster",index="foo_3"} 0
# HELP elasticsearch_indices_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_indices_indexing_is_throttled gauge
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index=".geoip_databases"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
elasticsearch_indices_indexing_is_throttled{cluster="unknown_cluster",index="foo_3"} 0
# HELP elasticsearch_index_stats_indexing_is_throttled Whether indexing is currently throttled for an index (1=throttled, 0=not throttled)
# TYPE elasticsearch_index_stats_indexing_is_throttled gauge
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index=".geoip_databases"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_1"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_2"} 0
elasticsearch_index_stats_indexing_is_throttled{cluster="unknown_cluster",index="foo_3"} 0
# HELP elasticsearch_index_stats_merge_auto_throttle_bytes_total Total bytes that were auto-throttled during merging
# TYPE elasticsearch_index_stats_merge_auto_throttle_bytes_total counter
elasticsearch_index_stats_merge_auto_throttle_bytes_total{cluster="unknown_cluster",index=".geoip_databases"} 2.097152e+07
Expand Down
12 changes: 12 additions & 0 deletions collector/nodes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"strings"
"testing"

"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/prometheus/common/promslog"
)
Expand Down Expand Up @@ -1604,3 +1605,14 @@ func TestNodesStats(t *testing.T) {
})
}
}

func TestNodesAndIndicesRegisterTogether(t *testing.T) {
u, err := url.Parse("http://example.com")
if err != nil {
t.Fatal(err)
}

reg := prometheus.NewRegistry()
reg.MustRegister(NewNodes(promslog.NewNopLogger(), http.DefaultClient, u, true, "_local"))
reg.MustRegister(NewIndices(promslog.NewNopLogger(), http.DefaultClient, u, false, true))
}