Skip to content

Commit 1a79df3

Browse files
use build and version info in metric
1 parent de4bb0a commit 1a79df3

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

receiver/splunkenterprisereceiver/documentation.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ The status of a rolling restart.
265265
| ---- | ----------- | ------ |
266266
| splunk.searchable.restart | Boolean that indicates if a searchable rolling restart/upgrade in progress.t | Any Bool |
267267
| splunk.rollingorrestart | Boolean that indicates if there is a rolling restart or rolling upgrade in progress. | Any Bool |
268+
| splunk.splunkd.build | The build number for this Splunk instance version | Any Str |
269+
| splunk.splunkd.version | The splunkd version number | Any Str |
268270

269271
### splunk.indexer.throughput
270272

receiver/splunkenterprisereceiver/internal/metadata/generated_metrics.go

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

receiver/splunkenterprisereceiver/internal/metadata/generated_metrics_test.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

receiver/splunkenterprisereceiver/metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ metrics:
381381
unit: "{status}"
382382
gauge:
383383
value_type: int
384-
attributes: [splunk.searchable.restart, splunk.rollingorrestart]
384+
attributes: [splunk.searchable.restart, splunk.rollingorrestart, splunk.splunkd.build, splunk.splunkd.version]
385385

386386
# Search Metrics
387387
splunk.search.duration:

receiver/splunkenterprisereceiver/scraper.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,11 +2063,13 @@ func (s *splunkScraper) setSearchJobTTLByID(sid string) error {
20632063
}
20642064

20652065
// Scrape Indexer Cluster Manger Status Endpoint
2066-
func (s *splunkScraper) scrapeIndexerClusterManagerStatus(_ context.Context, now pcommon.Timestamp, _ infoDict, errs chan error) {
2066+
func (s *splunkScraper) scrapeIndexerClusterManagerStatus(_ context.Context, now pcommon.Timestamp, info infoDict, errs chan error) {
20672067
if !s.conf.Metrics.SplunkIndexerRollingrestartStatus.Enabled {
20682068
return
20692069
}
20702070

2071+
i := info[typeCm].Entries[0].Content
2072+
20712073
ept := apiDict[`SplunkIndexerClusterManagerStatus`]
20722074
var icms indexersClusterManagerStatus
20732075

@@ -2090,8 +2092,8 @@ func (s *splunkScraper) scrapeIndexerClusterManagerStatus(_ context.Context, now
20902092

20912093
for _, ic := range icms.Entries {
20922094
if ic.Content.RollingRestartOrUpgrade {
2093-
s.mb.RecordSplunkIndexerRollingrestartStatusDataPoint(now, 1, ic.Content.SearchableRolling, ic.Content.RollingRestartFlag)
2095+
s.mb.RecordSplunkIndexerRollingrestartStatusDataPoint(now, 1, ic.Content.SearchableRolling, ic.Content.RollingRestartFlag, i.Build, i.Version)
20942096
}
2095-
s.mb.RecordSplunkIndexerRollingrestartStatusDataPoint(now, 0, ic.Content.SearchableRolling, ic.Content.RollingRestartFlag)
2097+
s.mb.RecordSplunkIndexerRollingrestartStatusDataPoint(now, 0, ic.Content.SearchableRolling, ic.Content.RollingRestartFlag, i.Build, i.Version)
20962098
}
20972099
}

0 commit comments

Comments
 (0)