Move context in the loop and add aggregated graph size.

Author: clems4ever

internal/metrics/metrics.go

@@ -13,18 +13,30 @@ var StartTimeGauge = promauto.NewGauge(prometheus.GaugeOpts{
 
 // ********************* GRAPH METRICS ******************
 
-// GraphAssetsTotalGauge reports the number of nodes in the graph
+// GraphAssetsTotalGauge reports the number of nodes in the graph of a given source
 var GraphAssetsTotalGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
 	Name: "go_graphkb_graph_assets_total_gauge",
-	Help: "The number of nodes in the graph",
+	Help: "The number of nodes in the graph for a given source",
 }, []string{"source"})
 
-// GraphRelationsTotalGauge reports the number of nodes in the graph
+// GraphRelationsTotalGauge reports the number of nodes in the graph of a given source
 var GraphRelationsTotalGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
 	Name: "go_graphkb_graph_relations_total_gauge",
-	Help: "The number of edges in the graph",
+	Help: "The number of edges in the graph for a given source",
 }, []string{"source"})
 
+// GraphAssetsAggregatedGauge reports the number of nodes in the graph with the various sources merged
+var GraphAssetsAggregatedGauge = promauto.NewGauge(prometheus.GaugeOpts{
+	Name: "go_graphkb_graph_assets_aggregated_gauge",
+	Help: "The number of nodes in the graph with the various datasource graphs merged",
+})
+
+// GraphRelationsAggregatedGauge reports the number of nodes in the graph with the various sources merged
+var GraphRelationsAggregatedGauge = promauto.NewGauge(prometheus.GaugeOpts{
+	Name: "go_graphkb_graph_relations_aggregated_gauge",
+	Help: "The number of edges in the graph with the various datasource graphs merged",
+})
+
 // ********************* GRAPH UPDATE REQUESTS ******************
 
 // GraphUpdateRequestsReceivedCounter reports the number of authorized and not rate limited updates requests received by the webserver

internal/server/monitoring.go

@@ -24,16 +24,32 @@ func getMonitoringIntervalSeconds() time.Duration {
 func startGraphSizeMonitoring(interval time.Duration, database knowledge.GraphDB, sourcesRegistry sources.Registry) {
 	logrus.Infof("Monitoring of the graph size will happen every %ds", int(interval/time.Second))
 	go func() {
-		ctx, cancel := context.WithTimeout(context.Background(), interval)
-		defer cancel()
-
 		for {
+			ctx, cancel := context.WithTimeout(context.Background(), interval)
+			defer cancel()
+
 			logrus.Debug("Start monitoring the graph size...")
+			assetsCount, err := database.CountAssets(ctx)
+			if err != nil {
+				metrics.GraphAssetsAggregatedGauge.Set(-1)
+			} else {
+				metrics.GraphAssetsAggregatedGauge.Set(float64(assetsCount))
+			}
+
+			relationsCount, err := database.CountRelations(ctx)
+			if err != nil {
+				metrics.GraphRelationsAggregatedGauge.Set(-1)
+			} else {
+				metrics.GraphRelationsAggregatedGauge.Set(float64(relationsCount))
+			}
+
 			sources, err := sourcesRegistry.ListSources(ctx)
 			if err != nil {
 				logrus.Errorf("Unable to list sources for monitoring: %v", err)
-				continue
+				metrics.GraphAssetsTotalGauge.Reset()
+				metrics.GraphRelationsTotalGauge.Reset()
 			}
+
 			for s := range sources {
 				assetsCount, err := database.CountAssetsBySource(ctx, s)
 				if err != nil {