Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

more fixes

Browse Source 
Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2020-02-03 20:45:26 +01:00
parent 3f1fd6d08c
commit 503e0dc47a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/traffic/README.md
View File

@@ -135,7 +135,8 @@ we continue with step 4 above, ignoring any locality.
If monitoring is enabled (via the *prometheus* plugin) then the following metric are exported: If monitoring is enabled (via the *prometheus* plugin) then the following metric are exported:
* `coredns_traffic_clusters_tracked{}` the number of tracked clusters. * `coredns_traffic_cluster_tracked{}` the number of tracked clusters.
* `coredns_traffic_endpoint_tracked{}` the number of tracked clusters.
## Ready ## Ready

9
plugin/traffic/xds/client.go
View File

@@ -189,14 +189,15 @@ func (c *Client) receive(stream adsStream) error {
} }
a.SetClusterLoadAssignment(cluster.GetName(), nil) a.SetClusterLoadAssignment(cluster.GetName(), nil)
} }
log.Debugf("Cluster discovery processed with %d resources, version %q and nonce %q", len(resp.GetResources()), c.Version(cdsURL), c.Nonce(cdsURL))
ClusterGauge.Set(float64(len(resp.GetResources())))
// set our local administration and ack the reply. Empty version would signal NACK. // set our local administration and ack the reply. Empty version would signal NACK.
c.SetNonce(cdsURL, resp.GetNonce()) c.SetNonce(cdsURL, resp.GetNonce())
c.SetVersion(cdsURL, resp.GetVersionInfo()) c.SetVersion(cdsURL, resp.GetVersionInfo())
c.SetAssignments(a) c.SetAssignments(a)
c.clusterDiscovery(stream, resp.GetVersionInfo(), resp.GetNonce(), a.clusters()) c.clusterDiscovery(stream, resp.GetVersionInfo(), resp.GetNonce(), a.clusters())
log.Debugf("Cluster discovery processed with %d resources, version %q and nonce %q", len(resp.GetResources()), c.Version(cdsURL), c.Nonce(cdsURL))
ClusterGauge.Set(float64(len(resp.GetResources())))
// now kick off discovery for endpoints // now kick off discovery for endpoints
if err := c.endpointDiscovery(stream, c.Version(edsURL), c.Nonce(edsURL), a.clusters()); err != nil { if err := c.endpointDiscovery(stream, c.Version(edsURL), c.Nonce(edsURL), a.clusters()); err != nil {
log.Debug(err) log.Debug(err)
@@ -214,11 +215,13 @@ func (c *Client) receive(stream adsStream) error {
} }
c.assignments.SetClusterLoadAssignment(cla.GetClusterName(), cla) c.assignments.SetClusterLoadAssignment(cla.GetClusterName(), cla)
} }
log.Debugf("Endpoint discovery processed with %d resources, version %q and nonce %q", len(resp.GetResources()), c.Version(edsURL), c.Nonce(edsURL))
// set our local administration and ack the reply. Empty version would signal NACK. // set our local administration and ack the reply. Empty version would signal NACK.
c.SetNonce(edsURL, resp.GetNonce()) c.SetNonce(edsURL, resp.GetNonce())
c.SetVersion(edsURL, resp.GetVersionInfo()) c.SetVersion(edsURL, resp.GetVersionInfo())
log.Debugf("Endpoint discovery processed with %d resources, version %q and nonce %q", len(resp.GetResources()), c.Version(edsURL), c.Nonce(edsURL))
EndpointGauge.Set(float64(len(resp.GetResources())))
default: default:
return fmt.Errorf("unknown response URL for discovery: %q", resp.GetTypeUrl()) return fmt.Errorf("unknown response URL for discovery: %q", resp.GetTypeUrl())
} }

6
plugin/traffic/xds/metrics.go
View File

@@ -14,4 +14,10 @@ var (
Name: "clusters_tracked", Name: "clusters_tracked",
Help: "Gauge of tracked clusters.", Help: "Gauge of tracked clusters.",
}) })
EndpointGauge = prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: plugin.Namespace,
Subsystem: "traffic",
Name: "endpoints_tracked",
Help: "Gauge of all tracked endpoints.",
})
) )