Merge branch 'cardinality-fix' into 'main'

Cardinality fix

See merge request danet/csbi!6

build.go

@@ -36,7 +36,7 @@ func buildImage(d Deployment, dockerClient *client.Client) error {
 	labels := prometheus.Labels{"type": spb.Type_CONTAINERISED.String()}
 	start := promStartHook(labels, buildsTotal)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*120)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*300)
 	defer cancel()
 
 	p := filepath.Join(d.ID.String(), "/")

docker-compose.yml

@@ -46,4 +46,4 @@ volumes:
   grafana-data:
 
 networks:
-  csbi-dev-net:
+  csbi-dev-net:
\ No newline at end of file

metrics.go

@@ -98,7 +98,7 @@ var (
 			Name: "orchestrator_creations_total",
 			Help: "Total number of created deployments",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorDestructionsTotal = promauto.NewCounterVec(
@@ -106,7 +106,7 @@ var (
 			Name: "orchestrator_destructions_total",
 			Help: "Total number of destroyed deployments",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorErrorsTotal = promauto.NewCounterVec(
@@ -114,7 +114,7 @@ var (
 			Name: "orchestrator_errors_total",
 			Help: "Total number of orchestrator errors",
 		},
-		[]string{"type", "name", "error"},
+		[]string{"type", "error"},
 	)
 
 	orchestratorCreateDurationSeconds = promauto.NewHistogramVec(
@@ -122,7 +122,7 @@ var (
 			Name: "orchestrator_create_duration_seconds",
 			Help: "Histogram of create operation duration",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorCreateDurationSecondsTotal = promauto.NewCounterVec(
@@ -130,7 +130,7 @@ var (
 			Name: "orchestrator_create_duration_seconds_total",
 			Help: "Total time required for create operations",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorDestroyDurationSeconds = promauto.NewHistogramVec(
@@ -138,7 +138,7 @@ var (
 			Name: "orchestrator_destroy_duration_seconds",
 			Help: "Histogram of destroy operation duration",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	orchestratorDestroyDurationSecondsTotal = promauto.NewCounterVec(
@@ -146,7 +146,7 @@ var (
 			Name: "orchestrator_destroy_duration_seconds_total",
 			Help: "Total time required for destroy operations",
 		},
-		[]string{"type", "name"},
+		[]string{"type"},
 	)
 
 	codeGenerationErrorsTotal = promauto.NewCounterVec(

prometheus/prometheus.yml

 global:
   scrape_interval: 5s
-  scrape_timeout: 10s
+  scrape_timeout: 3s
 
 rule_files:
   - alert.yml