feat(argus): release argus charts v11.1.0 (#169)

Author: lmshubhashri

charts/argus/Chart.yaml

@@ -6,9 +6,9 @@ maintainers:
   - email: argus@logicmonitor.com
     name: LogicMonitor
 name: argus
-version: 11.0.0
+version: 11.1.0
 home: https://logicmonitor.github.io/helm-charts
-appVersion: v15.0.0
+appVersion: v15.1.0
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts

charts/argus/templates/_argus_config.tpl

@@ -76,4 +76,5 @@ proxy:
 proxy:
   url: {{ .Values.global.proxy.url }}
 {{- end }}
+ksmUrl: {{ include "ksm-url" . | quote }}
 {{- end -}}

charts/argus/templates/_helpers.tpl

@@ -117,6 +117,49 @@ Collector Pod security context
 {{ toYaml .Values.collector.podSecurityContext | nindent 0 }}
 {{- end }}
 
+{{- define "ksm-url" -}}
+{{- $url := "" }}
+{{- $ksm := index .Values.global "kube-state-metrics" }}
+{{- if not (empty .Values.ksmUrl) }}
+{{- $url = .Values.ksmUrl }}
+{{- else if $ksm.enabled }}
+{{- $port := 8080 }}
+{{- $url = printf "http://%s-kube-state-metrics.%s.svc.cluster.local:%d/metrics" .Release.Name .Release.Namespace $port }}
+{{- else }}
+{{- $nsservices := (lookup "v1" "Service" .Release.Namespace "") | default dict }}
+{{- $nsfilteredServices := dict "items" (list) }}
+{{- range $service := $nsservices.items }}
+  {{- if eq (index $service.metadata.labels "app.kubernetes.io/name" | default "") "kube-state-metrics" }}
+    {{- $_ := set $nsfilteredServices "items" (append $nsfilteredServices.items $service) }}
+    {{- $port := "" }}
+    {{- range $p := $service.spec.ports }}
+      {{- if or (eq $p.name "http") (eq $p.name "http-metrics") }}
+        {{- $port = $p.port }}
+      {{- end }}
+    {{- end }}
+    {{- $url = printf "http://%s.%s.svc.cluster.local:%d/metrics" $service.metadata.name $service.metadata.namespace $port }}
+  {{- end }}
+{{- end }}
+{{- if (empty $url)}}
+{{- $services := (lookup "v1" "Service" "" "") | default dict }}
+{{- $filteredServices := dict "items" (list) }}
+{{- range $service := $services.items }}
+  {{- if eq (index $service.metadata.labels "app.kubernetes.io/name" | default "") "kube-state-metrics" }}
+    {{- $_ := set $filteredServices "items" (append $filteredServices.items $service) }}
+    {{- $port := "" }}
+    {{- range $p := $service.spec.ports }}
+      {{- if or (eq $p.name "http") (eq $p.name "http-metrics") }}
+        {{- $port = $p.port }}
+      {{- end }}
+    {{- end }}
+    {{- $url = printf "http://%s.%s.svc.cluster.local:%d/metrics" $service.metadata.name $service.metadata.namespace $port }}
+  {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- $url }}
+{{- end }}
+
 {{- define "collector-csp" }}
 {{- $addCaps := .Values.collector.securityContext.capabilities.add }}
 {{- if and (eq (include "lmutil.get-platform" .) "gke") (not (has "NET_RAW" $addCaps)) }}

charts/argus/values.schema.json

@@ -461,6 +461,16 @@
       },
       "$comment": "tf:optional,yamlencode"
     },
+    "ksmUrl": {
+      "$id": "#/properties/ksmUrl",
+      "type": "string",
+      "title": "KSM service URL",
+      "description": "KSM service URL to be used by devices in the portal",
+      "default": "",
+      "examples": [
+        "http://lmc-kube-state-metrics.logicmonitor.svc.cluster.local:8080/metrics"
+      ]
+    },
     "replicas": {
       "$id": "#/properties/replicas",
       "type": "integer",
@@ -2325,6 +2335,14 @@
           "default": "",
           "description" : "The Logicmonitor account domain"
         },
+        "kube-state-metrics": {
+          "$id": "#/properties/global/properties/kube-state-metrics",
+          "type": "object",
+          "title": "Kube state metrics config",
+          "description": "Kube state metrics.",
+          "additionalItems": true,
+          "additionalProperties": true
+        },
         "imagePullSecrets": {
           "description": "ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. For example, in the case of docker, only DockerConfig type secrets are honored. More info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod",
           "examples": [

charts/argus/values.yaml

@@ -64,6 +64,8 @@ resourceContainerID: 1
 log:
   level: "info"
 
+ksmUrl: ""
+
 collectorsetcontroller:
   address: collectorset-controller
   port: 50000