[Insights Agent] Prometheus Collector (FairwindsOps#396)

* Add prometheus collector

* Add subchart

* Add prometheus address

* Fix prometheus

* Add RBAC

* Add prometheus to list of repos

* Fix prometheus version

* Install prometheus on e2e tests

* Fix URL for prometheus

* Fix prometheus server name override

* Fix hostname

* Make prometheus run every 10 minutes

* Fixup default valueS

* Rename prometheus

* remove dash

* update helm dependencies

* fixed condition

* Update prometheus version

* Fix lint

scripts/ct.yaml

@@ -7,3 +7,4 @@ chart-repos:
   - "jetstack=https://charts.jetstack.io"
   - "fairwinds-stable=https://charts.fairwinds.com/stable"
   - "fairwinds-incubator=https://charts.fairwinds.com/incubator"
+  - "prometheus-community=https://prometheus-community.github.io/helm-charts"

stable/insights-agent/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to run the Fairwinds Insights agent
 name: insights-agent
-version: 1.2.0
+version: 1.3.0
 appVersion: 2.2.0
 maintainers:
   - name: rbren

stable/insights-agent/README.md

@@ -35,6 +35,7 @@ There are several different report types which can be enabled and configured:
 * `kubebench`
 * `pluto`
 * `opa`
+* `prometheus`
 
 See below for configuration details.
 

stable/insights-agent/ci/test-values.yaml

@@ -31,3 +31,7 @@ kubehunter:
 trivy:
   enabled: true
   maxScansPerRun: 2
+
+resourcemetrics:
+  enabled: true
+  installPrometheus: true

stable/insights-agent/requirements.lock

@@ -2,5 +2,8 @@ dependencies:
 - name: goldilocks
   repository: https://charts.fairwinds.com/stable
   version: 2.3.1
-digest: sha256:0734b3efb9017569a001b9ac11749e2927c8284a8ca3e38e734617e262164abe
-generated: "2020-05-01T09:29:55.491445-06:00"
+- name: prometheus
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 11.16.9
+digest: sha256:5b9fe030149e681dd8ab9292854524d2fd01d8536351f98899f0cb1519a78f94
+generated: "2020-12-07T11:10:53.373862-05:00"

stable/insights-agent/requirements.yaml

@@ -1,5 +1,9 @@
 dependencies:
-  - name: goldilocks
-    repository: https://charts.fairwinds.com/stable
-    version: 2.3.1
-    condition: goldilocks.enabled
+- name: goldilocks
+  repository: https://charts.fairwinds.com/stable
+  version: 2.3.1
+  condition: goldilocks.enabled
+- name: prometheus
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 11.16.9
+  condition: resourcemetrics.installPrometheus

stable/insights-agent/templates/rbac.yaml

@@ -42,6 +42,11 @@ subjects:
   name: {{ include "insights-agent.fullname" . }}-opa
   namespace: {{ .Release.Namespace }}
 {{- end }}
+{{- if .Values.resourcemetrics.enabled }}
+- kind: ServiceAccount
+  name: {{ include "insights-agent.fullname" . }}-resource-metrics
+  namespace: {{ .Release.Namespace }}
+{{- end }}
 {{- if .Values.goldilocks.enabled }}
 - kind: ServiceAccount
   name: {{ include "insights-agent.fullname" . }}-goldilocks

stable/insights-agent/templates/resource-metrics/cronjob.yaml

@@ -0,0 +1,25 @@
+{{- if .Values.resourcemetrics.enabled -}}
+{{- $_ := set . "Label" "resource-metrics" }}
+{{- $_ := set . "Config" .Values.resourcemetrics }}
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  {{- include "metadata" . }}
+spec:
+  {{ include "cronjob-spec" . | nindent 2 | trim }}
+  jobTemplate:
+    spec:
+      {{ include "job-spec" . | nindent 6 | trim }}
+      template:
+        spec:
+          {{ include "job-template-spec" . | indent 10 | trim }}
+          containers:
+          - {{ include "container-spec" . | indent 12 | trim }}
+            command:
+            - prometheus-collector
+            env:
+            - name: PROMETHEUS_ADDRESS
+              value: {{ .Values.resourcemetrics.address | quote }}
+            {{ include "security-context" . | indent 12 | trim }}
+          {{ include "uploaderContainer" . | indent 10 | trim }}
+{{- end -}}

stable/insights-agent/templates/resource-metrics/rbac.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.resourcemetrics.enabled -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "insights-agent.fullname" . }}-resource-metrics
+  labels:
+    app: insights-agent
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "insights-agent.fullname" . }}-resource-metrics-view
+  labels:
+    app: insights-agent
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: view
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "insights-agent.fullname" . }}-resource-metrics
+    namespace: {{ .Release.Namespace }}
+{{- end -}}
+

stable/insights-agent/values.yaml

@@ -239,6 +239,35 @@ pluto:
       cpu: 10m
       memory: 64Mi
 
+resourcemetrics:
+  enabled: false
+  installPrometheus: false
+  schedule: "0/10 * * * *"
+  timeout: 300
+  address: "http://prometheus-server"
+  image:
+    repository: quay.io/fairwinds/prometheus-collector
+    tag: "0.2"
+  resources:
+    limits:
+      cpu: 250m
+      memory: 512Mi
+    requests:
+      cpu: 10m
+      memory: 64Mi
+
+prometheus:
+  alertmanager:
+    enabled: false
+  kubeStateMetrics:
+    enabled: false
+  nodeExporter:
+    enabled: false
+  pushgateway:
+    enabled: false
+  server:
+    fullnameOverride: "prometheus-server"
+
 # test -- Used for chart CI only - deploys a test deployment
 test:
   enabled: false