Merge pull request #27 from uselagoon/prometheus-status-check

fix: update status to check for 2xx and any other 200 http code with regex

PROJECT

@@ -1,3 +1,3 @@
 domain: amazee.io
-repo: github.com/amazeeio/aergia-controller
+repo: github.com/uselagoon/aergia-controller
 version: "2"

build-push.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-REPO=${2:-amazeeio}
+REPO=${2:-uselagoon}
 TAG=${1:-latest}
 IMGNAME=${3:-aergia}
 echo "Creating image for $REPO/${IMGNAME}:$TAG and pushing to docker hub"

controllers/idling_controller.go

@@ -20,9 +20,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/amazeeio/aergia-controller/handlers/idler"
-	"github.com/amazeeio/aergia-controller/handlers/unidler"
 	"github.com/go-logr/logr"
+	"github.com/uselagoon/aergia-controller/handlers/idler"
+	"github.com/uselagoon/aergia-controller/handlers/unidler"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"

go.mod

@@ -1,4 +1,4 @@
-module github.com/amazeeio/aergia-controller
+module github.com/uselagoon/aergia-controller
 
 go 1.21
 

handlers/idler/service-kubernetes.go

@@ -126,7 +126,7 @@ func (h *Idler) KubernetesServiceIdler(ctx context.Context, opLog logr.Logger, n
 				defer cancel()
 				// get the number of requests to any ingress in the exported namespace by status code
 				promQuery := fmt.Sprintf(
-					`round(sum(increase(nginx_ingress_controller_requests{exported_namespace="%s",status="200"}[%s])) by (status))`,
+					`round(sum(increase(nginx_ingress_controller_requests{exported_namespace="%s",status=~"2[0-9x]{2}"}[%s])) by (status))`,
 					namespace.ObjectMeta.Name,
 					prometheusInternalCheck,
 				)

main.go

@@ -22,13 +22,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/amazeeio/aergia-controller/controllers"
-	"github.com/amazeeio/aergia-controller/handlers/idler"
-	"github.com/amazeeio/aergia-controller/handlers/metrics"
-	"github.com/amazeeio/aergia-controller/handlers/unidler"
-	u "github.com/amazeeio/aergia-controller/handlers/unidler"
 	prometheusapi "github.com/prometheus/client_golang/api"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/uselagoon/aergia-controller/controllers"
+	"github.com/uselagoon/aergia-controller/handlers/idler"
+	"github.com/uselagoon/aergia-controller/handlers/metrics"
+	"github.com/uselagoon/aergia-controller/handlers/unidler"
+	u "github.com/uselagoon/aergia-controller/handlers/unidler"
 	variables "github.com/uselagoon/machinery/utils/variables"
 	"gopkg.in/robfig/cron.v2"
 	"gopkg.in/yaml.v2"