Merge branch 'master' into add-pingdom-transaction-checks

.github/workflows/pull_request.yml

@@ -23,12 +23,12 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{github.event.pull_request.head.sha}}
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOLANG_VERSION }}
 
@@ -41,7 +41,7 @@ jobs:
 
     # Set up helm binary
     - name: Set up Helm
-      uses: azure/setup-helm@v3
+      uses: azure/setup-helm@v4
       with:
         version: ${{ env.HELM_VERSION }}
 
@@ -78,15 +78,15 @@ jobs:
         echo "GIT_TAG=$(echo ${tag})" >> $GITHUB_OUTPUT
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
       with:
         buildkitd-flags: --debug
 
     - name: Login to Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }}
         password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }}
@@ -96,7 +96,7 @@ jobs:
         echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}

.github/workflows/push.yml

@@ -30,13 +30,13 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
         fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ env.GOLANG_VERSION }}
 
@@ -49,7 +49,7 @@ jobs:
 
     # Set up helm binary
     - name: Set up Helm
-      uses: azure/setup-helm@v3
+      uses: azure/setup-helm@v4
       with:
         version: ${{ env.HELM_VERSION }}
 
@@ -88,15 +88,15 @@ jobs:
         DRY_RUN: true
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
       with:
         buildkitd-flags: --debug
 
     - name: Login to Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }}
         password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }}
@@ -106,7 +106,7 @@ jobs:
         echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}
@@ -160,7 +160,7 @@ jobs:
       run: operator-sdk bundle validate ./bundle --select-optional name=operatorhub
 
     - name: Build and push Bundle Image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
         file: ${{ env.BUNDLE_DOCKER_FILE_PATH  }}

.github/workflows/release.yml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # See: https://goreleaser.com/ci/actions/
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GOLANG_VERSION }}
 

api/v1alpha1/endpointmonitor_types.go

@@ -381,6 +381,14 @@ type GCloudConfig struct {
 // GrafnaConfiguration defines the configuration for Grafana Cloud Monitor Provider
 type GrafanaConfig struct {
 	TenantId int64 `json:"tenantId,omitempty"`
+
+	// The frequency value specifies how often the check runs in milliseconds
+	Frequency int64 `json:"frequency,omitempty"`
+
+	// Probes are the monitoring agents responsible for simulating user interactions with your web applications
+	// or services. These agents periodically send requests to predefined URLs and record the responses,
+	// checking for expected outcomes and measuring performance.
+	Probes []string `json:"probes,omitempty"`
 }
 
 // URLSource represents the set of resources to fetch the URL from

bundle/manifests/endpointmonitor.stakater.com_endpointmonitors.yaml

@@ -62,6 +62,20 @@ spec:
               grafanaConfig:
                 description: Configuration for Grafana Cloud Monitor Provider
                 properties:
+                  frequency:
+                    description: The frequency value specifies how often the check
+                      runs in milliseconds
+                    format: int64
+                    type: integer
+                  probes:
+                    description: Probes are the monitoring agents responsible for
+                      simulating user interactions with your web applications or services.
+                      These agents periodically send requests to predefined URLs and
+                      record the responses, checking for expected outcomes and measuring
+                      performance.
+                    items:
+                      type: string
+                    type: array
                   tenantId:
                     format: int64
                     type: integer

bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml

@@ -18,7 +18,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.18.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: ingressmonitorcontroller.v2.1.49
+  name: ingressmonitorcontroller.v2.1.59
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -151,7 +151,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: stakater/ingressmonitorcontroller:v2.1.49
+                image: stakater/ingressmonitorcontroller:v2.1.59
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -251,4 +251,4 @@ spec:
   provider:
     name: stakater
     url: https://stakater.com
-  version: 2.1.49
+  version: 2.1.59

charts/ingressmonitorcontroller/Chart.yaml

@@ -3,10 +3,10 @@ name: ingressmonitorcontroller
 description: IngressMonitorController Operator chart that runs on kubernetes
 
 # Helm chart Version
-version: 2.1.49
+version: 2.1.59
 
 # Application version to be deployed
-appVersion: 2.1.49
+appVersion: 2.1.59
 
 keywords:
   - IngressMonitorController

charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml

@@ -63,6 +63,20 @@ spec:
               grafanaConfig:
                 description: Configuration for Grafana Cloud Monitor Provider
                 properties:
+                  frequency:
+                    description: The frequency value specifies how often the check
+                      runs in milliseconds
+                    format: int64
+                    type: integer
+                  probes:
+                    description: Probes are the monitoring agents responsible for
+                      simulating user interactions with your web applications or services.
+                      These agents periodically send requests to predefined URLs and
+                      record the responses, checking for expected outcomes and measuring
+                      performance.
+                    items:
+                      type: string
+                    type: array
                   tenantId:
                     format: int64
                     type: integer

charts/ingressmonitorcontroller/templates/deployment.yaml

@@ -6,6 +6,10 @@ metadata:
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
     control-plane: controller-manager
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:

charts/ingressmonitorcontroller/values.yaml

@@ -8,7 +8,7 @@ replicaCount: 1
 
 image:
   repository: stakater/ingressmonitorcontroller
-  tag: v2.1.49
+  tag: v2.1.59
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 
@@ -71,6 +71,8 @@ resources:
   #   cpu: 100m
   #   memory: 128Mi
 
+deploymentAnnotations: {}
+
 podAnnotations: {}
 
 podSecurityContext:

config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml

@@ -63,6 +63,20 @@ spec:
               grafanaConfig:
                 description: Configuration for Grafana Cloud Monitor Provider
                 properties:
+                  frequency:
+                    description: The frequency value specifies how often the check
+                      runs in milliseconds
+                    format: int64
+                    type: integer
+                  probes:
+                    description: Probes are the monitoring agents responsible for
+                      simulating user interactions with your web applications or services.
+                      These agents periodically send requests to predefined URLs and
+                      record the responses, checking for expected outcomes and measuring
+                      performance.
+                    items:
+                      type: string
+                    type: array
                   tenantId:
                     format: int64
                     type: integer

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: stakater/ingressmonitorcontroller
-  newTag: v2.1.49
+  newTag: v2.1.59

docs/grafana-configuration.md

@@ -41,6 +41,9 @@ metadata:
 spec:
   forceHttps: true
   url: https://stakater.com/
-  gcloudConfig:
-    frequency: 5000
+  grafanaConfig:
+    frequency: 10000
+    probes:
+      - Amsterdam
+      - Singapore
 ```