From e304345883dcaf7500e9e1694b8240ae07cfe4d1 Mon Sep 17 00:00:00 2001 From: Iridias Date: Tue, 27 Feb 2024 11:26:36 +0100 Subject: [PATCH 1/3] synthetic-monitoring-agent: change Deployment to StatefulSet Signed-off-by: Iridias --- .../templates/{deployment.yaml => statefulset.yaml} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename charts/synthetic-monitoring-agent/templates/{deployment.yaml => statefulset.yaml} (96%) diff --git a/charts/synthetic-monitoring-agent/templates/deployment.yaml b/charts/synthetic-monitoring-agent/templates/statefulset.yaml similarity index 96% rename from charts/synthetic-monitoring-agent/templates/deployment.yaml rename to charts/synthetic-monitoring-agent/templates/statefulset.yaml index 137177aabb..75e1a60147 100644 --- a/charts/synthetic-monitoring-agent/templates/deployment.yaml +++ b/charts/synthetic-monitoring-agent/templates/statefulset.yaml @@ -1,14 +1,13 @@ apiVersion: apps/v1 -kind: Deployment +kind: StatefulSet metadata: name: {{ include "synthetic-monitoring-agent.fullname" . }} labels: {{- include "synthetic-monitoring-agent.labels" . | nindent 4 }} spec: minReadySeconds: 10 - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} + replicas: 1 + serviceName: {{ include "synthetic-monitoring-agent.fullname" . }}-headless selector: matchLabels: {{- include "synthetic-monitoring-agent.selectorLabels" . | nindent 6 }} From a59c56f063d4aed481e18b4c0a7967b0a4d6a415 Mon Sep 17 00:00:00 2001 From: Iridias Date: Tue, 27 Feb 2024 12:22:31 +0100 Subject: [PATCH 2/3] removed autoscaling-resources / increased chart-version Signed-off-by: Iridias --- charts/synthetic-monitoring-agent/Chart.yaml | 2 +- charts/synthetic-monitoring-agent/README.md | 6 ---- .../templates/hpa.yaml | 28 ------------------- charts/synthetic-monitoring-agent/values.yaml | 15 ---------- 4 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 charts/synthetic-monitoring-agent/templates/hpa.yaml diff --git a/charts/synthetic-monitoring-agent/Chart.yaml b/charts/synthetic-monitoring-agent/Chart.yaml index acf3ac73b5..f5d62363a7 100644 --- a/charts/synthetic-monitoring-agent/Chart.yaml +++ b/charts/synthetic-monitoring-agent/Chart.yaml @@ -15,4 +15,4 @@ name: synthetic-monitoring-agent sources: - https://github.com/grafana/synthetic-monitoring-agent type: application -version: 0.2.0 +version: 0.3.0 diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 9e9a4192a1..5e89fb52f3 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -32,11 +32,6 @@ Kubernetes: `^1.16.0-0` | agent.debug | bool | `false` | Enable / disable debug logging on the agent. | | agent.enableDisconnect | bool | `false` | Enable / disable the HTTP /disconnect endpoint | | agent.verbose | bool | `false` | Enable / disable verbose logging on the agent. | -| autoscaling.enabled | bool | `false` | Enable autoscaling | -| autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas | -| autoscaling.minReplicas | int | `1` | Minimum autoscaling replicas | -| autoscaling.targetCPUUtilizationPercentage | int | `60` | Target CPU utilisation percentage | -| autoscaling.targetMemoryUtilizationPercentage | string | `nil` | Target memory utilisation percentage | | extraObjects | list | `[]` | Add dynamic manifests via values: | | fullnameOverride | string | `""` | Override the fullname of the chart. | | hostAliases | list | `[]` | hostAliases to add | @@ -52,7 +47,6 @@ Kubernetes: `^1.16.0-0` | podLabels | object | `{}` | Labels to add to each pod. | | podSecurityContext | object | `{"fsGroup":65534}` | Security context on the Pod level. | | readinessProbe | object | `{"httpGet":{"path":"/ready","port":"http"}}` | Readiness probe for the agent | -| replicaCount | int | `1` | Number of replicas to use; ignored if `autoscaling.enabled` is set to `true`. | | resources | object | `{}` | Default resources to apply. | | securityContext | object | `{"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":65534}` | Security context for the container level. | | service.annotations | object | `{}` | Annotations for the service | diff --git a/charts/synthetic-monitoring-agent/templates/hpa.yaml b/charts/synthetic-monitoring-agent/templates/hpa.yaml deleted file mode 100644 index 213acb9d2a..0000000000 --- a/charts/synthetic-monitoring-agent/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "synthetic-monitoring-agent.fullname" . }} - labels: - {{- include "synthetic-monitoring-agent.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "synthetic-monitoring-agent.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/synthetic-monitoring-agent/values.yaml b/charts/synthetic-monitoring-agent/values.yaml index f924c53634..ba8be84ebe 100644 --- a/charts/synthetic-monitoring-agent/values.yaml +++ b/charts/synthetic-monitoring-agent/values.yaml @@ -15,9 +15,6 @@ agent: # -- Enable / disable verbose logging on the agent. verbose: false -# -- Number of replicas to use; ignored if `autoscaling.enabled` is set to `true`. -replicaCount: 1 - image: # -- Base registry to pull the container image from. registry: docker.io @@ -72,18 +69,6 @@ resources: # cpu: 200m # memory: 512Mi -autoscaling: - # -- Enable autoscaling - enabled: false - # -- Minimum autoscaling replicas - minReplicas: 1 - # -- Maximum autoscaling replicas - maxReplicas: 3 - # -- Target CPU utilisation percentage - targetCPUUtilizationPercentage: 60 - # -- Target memory utilisation percentage - targetMemoryUtilizationPercentage: - # -- Liveness probe for the agent livenessProbe: httpGet: From 0cb4b09c88c8d20556d882d12c24d16c32b6c1a0 Mon Sep 17 00:00:00 2001 From: Iridias Date: Thu, 14 Mar 2024 20:22:32 +0100 Subject: [PATCH 3/3] updated helm-docs Signed-off-by: Iridias --- charts/lgtm-distributed/README.md | 2 +- charts/loki-distributed/README.md | 4 ++-- charts/synthetic-monitoring-agent/README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/lgtm-distributed/README.md b/charts/lgtm-distributed/README.md index 76c4bae8db..52ab9fe6c4 100644 --- a/charts/lgtm-distributed/README.md +++ b/charts/lgtm-distributed/README.md @@ -43,4 +43,4 @@ Umbrella chart for a distributed Loki, Grafana, Tempo and Mimir stack | tempo.ingester.replicas | int | `1` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index d9fbdd1d1e..4ceb877fbd 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -107,7 +107,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | +| compactor.persistence.claims | list | | List of the compactor PVCs | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -300,7 +300,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | +| ingester.persistence.claims | list | | List of the ingester PVCs | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | diff --git a/charts/synthetic-monitoring-agent/README.md b/charts/synthetic-monitoring-agent/README.md index 5e89fb52f3..78c662dc62 100644 --- a/charts/synthetic-monitoring-agent/README.md +++ b/charts/synthetic-monitoring-agent/README.md @@ -1,6 +1,6 @@ # synthetic-monitoring-agent -![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) +![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.9.3-0-gcd7aadd](https://img.shields.io/badge/AppVersion-v0.9.3--0--gcd7aadd-informational?style=flat-square) Grafana's Synthetic Monitoring application. The agent provides probe functionality and executes network checks for monitoring remote targets. @@ -69,4 +69,4 @@ Kubernetes: `^1.16.0-0` | tolerations | list | `[]` | List of node taints to tolerate. | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) +Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0)