Skip to content

Commit aca0fa4

Browse files
RuloxRulox
committed
Do not expose zone sync metric if not present
1 parent 11a8271 commit aca0fa4

File tree

5 files changed

+25
-30
lines changed

5 files changed

+25
-30
lines changed

‎collector/nginx_plus.go‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -303,23 +303,25 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
303303
prometheus.GaugeValue, float64(upstream.Zombies), name)
304304
}
305305

306-
for name, zone := range stats.StreamZoneSync.Zones {
307-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["records_pending"],
308-
prometheus.GaugeValue, float64(zone.RecordsPending), name)
309-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["records_total"],
310-
prometheus.GaugeValue, float64(zone.RecordsTotal), name)
311-
}
306+
if stats.StreamZoneSync != nil {
307+
for name, zone := range stats.StreamZoneSync.Zones {
308+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["records_pending"],
309+
prometheus.GaugeValue, float64(zone.RecordsPending), name)
310+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["records_total"],
311+
prometheus.GaugeValue, float64(zone.RecordsTotal), name)
312+
}
312313

313-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["bytes_in"],
314-
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.BytesIn))
315-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["bytes_out"],
316-
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.BytesOut))
317-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["msgs_in"],
318-
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.MsgsIn))
319-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["msgs_out"],
320-
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.MsgsOut))
321-
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["nodes_online"],
322-
prometheus.GaugeValue, float64(stats.StreamZoneSync.Status.NodesOnline))
314+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["bytes_in"],
315+
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.BytesIn))
316+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["bytes_out"],
317+
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.BytesOut))
318+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["msgs_in"],
319+
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.MsgsIn))
320+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["msgs_out"],
321+
prometheus.CounterValue, float64(stats.StreamZoneSync.Status.MsgsOut))
322+
ch <- prometheus.MustNewConstMetric(c.streamZoneSyncMetrics["nodes_online"],
323+
prometheus.GaugeValue, float64(stats.StreamZoneSync.Status.NodesOnline))
324+
}
323325
}
324326

325327
var upstreamServerStates = map[string]float64{

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/nginxinc/nginx-prometheus-exporter
33
go 1.12
44

55
require (
6-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190529112308-8f20f677a8bf
6+
github.com/nginxinc/nginx-plus-go-client v0.3.1
77
github.com/prometheus/client_golang v0.9.2
88
)

‎go.sum‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
44
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
55
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
66
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
7-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190326123225-e0cdc4be0c7f h1:3DdSFnaXSvhgn9RhiptJiudBHmFq+wDRccrJwhrwHlg=
8-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190522143815-28e3fc49525c h1:xyY2/MuxVbzzEXAJkaFWERM3RtCaz/IX/jBOJZkZVc4=
9-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190522143815-28e3fc49525c/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY=
10-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190524095408-9fb6bf19a64e h1:7DbTRinSESf1WTnnGxoD7o0bvnFHIxVINTaMNYVFiHo=
11-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190524144844-4d90184fc765 h1:SwxKOmnP+AELWdMDac0N7x7dN1vxoKjK5i2x2qYjOGQ=
12-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190524144844-4d90184fc765/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY=
13-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190529112308-8f20f677a8bf h1:QFUdFoJTsB60JpskBNicEQhu220DEL7UV8SJKUwdi3o=
14-
github.com/nginxinc/nginx-plus-go-client v0.0.0-20190529112308-8f20f677a8bf/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY=
7+
github.com/nginxinc/nginx-plus-go-client v0.3.1 h1:oj3tG3v5Ei8v8RccCyGurpVE0jrBFp+EX08qIaaVkm4=
8+
github.com/nginxinc/nginx-plus-go-client v0.3.1/go.mod h1:DBAmdDP71tOhgFPdCMVusegzdKmLVpVL0nVcMX17pbY=
159
github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
1610
github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
1711
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=

‎vendor/github.com/nginxinc/nginx-plus-go-client/client/nginx.go‎

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

‎vendor/modules.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/beorn7/perks/quantile
44
github.com/golang/protobuf/proto
55
# github.com/matttproud/golang_protobuf_extensions v1.0.1
66
github.com/matttproud/golang_protobuf_extensions/pbutil
7-
# github.com/nginxinc/nginx-plus-go-client v0.0.0-20190529112308-8f20f677a8bf
7+
# github.com/nginxinc/nginx-plus-go-client v0.3.1
88
github.com/nginxinc/nginx-plus-go-client/client
99
# github.com/prometheus/client_golang v0.9.2
1010
github.com/prometheus/client_golang/prometheus

0 commit comments

Comments
 (0)