rename request count metric

from azure_resourcegraph_query_request_count to azure_resourcegraph_query_requests

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

README.md

@@ -48,10 +48,12 @@ HTTP Endpoints
 Global metrics
 --------------
 
-| Metric                              | Description                                                                    |
-|-------------------------------------|--------------------------------------------------------------------------------|
-| `azure_resourcegraph_querytime`     | Summary metric about query execution time                                      |
-| `azure_resourcegraph_ratelimit`     | Current ratelimit value from the Azure API                                     |
+| Metric                               | Description                                                                    |
+|--------------------------------------|--------------------------------------------------------------------------------|
+| `azure_resourcegraph_query_time`     | Summary metric about query execution time (incl. all subqueries)               |
+| `azure_resourcegraph_query_results`  | Number of results from query                                                   |
+| `azure_resourcegraph_query_requests` | Count of requests (eg paged subqueries) per query                              |
+| `azure_resourcegraph_ratelimit`      | Current rate limit value from the Azure API                                    |
 
 
 Example

global-metrics.go

@@ -3,10 +3,10 @@ package main
 import "github.com/prometheus/client_golang/prometheus"
 
 var (
-	prometheusQueryTime         *prometheus.SummaryVec
-	prometheusQueryResults      *prometheus.GaugeVec
-	prometheusQueryRequestCount *prometheus.CounterVec
-	prometheusRatelimit         *prometheus.GaugeVec
+	prometheusQueryTime     *prometheus.SummaryVec
+	prometheusQueryResults  *prometheus.GaugeVec
+	prometheusQueryRequests *prometheus.CounterVec
+	prometheusRatelimit     *prometheus.GaugeVec
 )
 
 func initGlobalMetrics() {
@@ -34,17 +34,17 @@ func initGlobalMetrics() {
 	)
 	prometheus.MustRegister(prometheusQueryResults)
 
-	prometheusQueryRequestCount = prometheus.NewCounterVec(
+	prometheusQueryRequests = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
-			Name: "azure_resourcegraph_query_request_count",
+			Name: "azure_resourcegraph_query_requests",
 			Help: "Azure ResourceGraph query request count",
 		},
 		[]string{
 			"module",
 			"metric",
 		},
 	)
-	prometheus.MustRegister(prometheusQueryRequestCount)
+	prometheus.MustRegister(prometheusQueryRequests)
 
 	prometheusRatelimit = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{

probe.go

@@ -108,7 +108,7 @@ func handleProbeRequest(w http.ResponseWriter, r *http.Request) {
 					Options:       &RequestOptions,
 				}
 
-				prometheusQueryRequestCount.With(prometheus.Labels{"module": moduleName, "metric": queryConfig.Metric}).Inc()
+				prometheusQueryRequests.With(prometheus.Labels{"module": moduleName, "metric": queryConfig.Metric}).Inc()
 
 				var results, queryErr = resourcegraphClient.Resources(ctx, Request)
 				if results.TotalRecords != nil {