Skip to content

Commit a997509

Browse files
authored
Revert "switch from warning to debug when upstream labels are empty (#724)" (#781)
This reverts commit d3f9f94.
1 parent 082ec9f commit a997509

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Diff for: collector/nginx_plus.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
658658
varLabelValues := c.getServerZoneLabelValues(name)
659659

660660
if c.variableLabelNames.ServerZoneVariableLabelNames != nil && len(varLabelValues) != len(c.variableLabelNames.ServerZoneVariableLabelNames) {
661-
level.Debug(c.logger).Log("msg", "wrong number of labels for http zone, empty labels will be used instead", "zone", name, "expected", len(c.variableLabelNames.ServerZoneVariableLabelNames), "got", len(varLabelValues))
661+
level.Warn(c.logger).Log("msg", "wrong number of labels for http zone, empty labels will be used instead", "zone", name, "expected", len(c.variableLabelNames.ServerZoneVariableLabelNames), "got", len(varLabelValues))
662662
for range c.variableLabelNames.ServerZoneVariableLabelNames {
663663
labelValues = append(labelValues, "")
664664
}
@@ -779,7 +779,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
779779
varLabelValues := c.getStreamServerZoneLabelValues(name)
780780

781781
if c.variableLabelNames.StreamServerZoneVariableLabelNames != nil && len(varLabelValues) != len(c.variableLabelNames.StreamServerZoneVariableLabelNames) {
782-
level.Debug(c.logger).Log("msg", "wrong number of labels for stream server zone, empty labels will be used instead", "zone", name, "expected", len(c.variableLabelNames.StreamServerZoneVariableLabelNames), "got", len(varLabelValues))
782+
level.Warn(c.logger).Log("msg", "wrong number of labels for stream server zone, empty labels will be used instead", "zone", name, "expected", len(c.variableLabelNames.StreamServerZoneVariableLabelNames), "got", len(varLabelValues))
783783
for range c.variableLabelNames.StreamServerZoneVariableLabelNames {
784784
labelValues = append(labelValues, "")
785785
}
@@ -816,7 +816,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
816816
varLabelValues := c.getUpstreamServerLabelValues(name)
817817

818818
if c.variableLabelNames.UpstreamServerVariableLabelNames != nil && len(varLabelValues) != len(c.variableLabelNames.UpstreamServerVariableLabelNames) {
819-
level.Debug(c.logger).Log("msg", "wrong number of labels for upstream, empty labels will be used instead", "upstream", name, "expected", len(c.variableLabelNames.UpstreamServerVariableLabelNames), "got", len(varLabelValues))
819+
level.Warn(c.logger).Log("msg", "wrong number of labels for upstream, empty labels will be used instead", "upstream", name, "expected", len(c.variableLabelNames.UpstreamServerVariableLabelNames), "got", len(varLabelValues))
820820
for range c.variableLabelNames.UpstreamServerVariableLabelNames {
821821
labelValues = append(labelValues, "")
822822
}
@@ -827,7 +827,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
827827
upstreamServer := fmt.Sprintf("%v/%v", name, peer.Server)
828828
varPeerLabelValues := c.getUpstreamServerPeerLabelValues(upstreamServer)
829829
if c.variableLabelNames.UpstreamServerPeerVariableLabelNames != nil && len(varPeerLabelValues) != len(c.variableLabelNames.UpstreamServerPeerVariableLabelNames) {
830-
level.Debug(c.logger).Log("msg", "wrong number of labels for upstream peer, empty labels will be used instead", "upstream", name, "peer", peer.Server, "expected", len(c.variableLabelNames.UpstreamServerPeerVariableLabelNames), "got", len(varPeerLabelValues))
830+
level.Warn(c.logger).Log("msg", "wrong number of labels for upstream peer, empty labels will be used instead", "upstream", name, "peer", peer.Server, "expected", len(c.variableLabelNames.UpstreamServerPeerVariableLabelNames), "got", len(varPeerLabelValues))
831831
for range c.variableLabelNames.UpstreamServerPeerVariableLabelNames {
832832
labelValues = append(labelValues, "")
833833
}
@@ -973,7 +973,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
973973
varLabelValues := c.getStreamUpstreamServerLabelValues(name)
974974

975975
if c.variableLabelNames.StreamUpstreamServerVariableLabelNames != nil && len(varLabelValues) != len(c.variableLabelNames.StreamUpstreamServerVariableLabelNames) {
976-
level.Debug(c.logger).Log("msg", "wrong number of labels for stream server, empty labels will be used instead", "server", name, "labels", c.variableLabelNames.StreamUpstreamServerVariableLabelNames, "values", varLabelValues)
976+
level.Warn(c.logger).Log("msg", "wrong number of labels for stream server, empty labels will be used instead", "server", name, "labels", c.variableLabelNames.StreamUpstreamServerVariableLabelNames, "values", varLabelValues)
977977
for range c.variableLabelNames.StreamUpstreamServerVariableLabelNames {
978978
labelValues = append(labelValues, "")
979979
}
@@ -984,7 +984,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) {
984984
upstreamServer := fmt.Sprintf("%v/%v", name, peer.Server)
985985
varPeerLabelValues := c.getStreamUpstreamServerPeerLabelValues(upstreamServer)
986986
if c.variableLabelNames.StreamUpstreamServerPeerVariableLabelNames != nil && len(varPeerLabelValues) != len(c.variableLabelNames.StreamUpstreamServerPeerVariableLabelNames) {
987-
level.Debug(c.logger).Log("msg", "wrong number of labels for stream upstream peer, empty labels will be used instead", "server", upstreamServer, "labels", c.variableLabelNames.StreamUpstreamServerPeerVariableLabelNames, "values", varPeerLabelValues)
987+
level.Warn(c.logger).Log("msg", "wrong number of labels for stream upstream peer, empty labels will be used instead", "server", upstreamServer, "labels", c.variableLabelNames.StreamUpstreamServerPeerVariableLabelNames, "values", varPeerLabelValues)
988988
for range c.variableLabelNames.StreamUpstreamServerPeerVariableLabelNames {
989989
labelValues = append(labelValues, "")
990990
}

0 commit comments

Comments
 (0)