0.2.0: Service Monitor

mumoshu · Feb 22, 2019 · f007b2b · f007b2b
1 parent 9dc9e21
commit f007b2b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
 dev:
-	helm tiller run tiller-system -- helm template
+	helm tiller run tiller-system -- helm template charts/prometheus-process-exporter
 	helm tiller run tiller-system -- helm upgrade --debug --install --force prometheus-exporter charts/prometheus-process-exporter
+	kubectl port-forward svc/process-exporter-prometheus-process-exporter 9100
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ The following table lists the configurable parameters of the process exporter ch
 | `image.repository`                | Image repository                                                                                                              | `ncabatoff/process-exporter`      |     |
 | `image.tag`                       | Image tag                                                                                                                     | `0.4.0`                               |     |
 | `image.pullPolicy`                | Image pull policy                                                                                                             | `IfNotPresent`                          |     |
-| `groups`                         | [Entries of `process_names:` in the process-expoter config](https://github.com/ncabatoff/process-exporter/tree/master#using-a-config-file) | `{"groups": [{"comm": ["chronyd"]}, {"comm": ["bash"]}, {"comm": ["rsync"]}, {"comm": ["scp"]}]` |
+| `groups`                         | [Entries of `process_names:` in the process-expoter config](https://github.com/ncabatoff/process-exporter/tree/master#using-a-config-file) | `{"groups": [{"comm": ["chronyd"]}, {"comm": ["bash"]}, {"comm": ["rsync"]}, {"comm": ["scp"]}, {"comm": ["ssh"]}]` |
 | `extraArgs`                       | Additional container arguments                                                                                                | `[]`                                    |     |
 | `extraHostVolumeMounts`           | Additional host volume mounts                                                                                                 | {}                                      |     |
 | `podLabels`                       | Additional labels to be added to pods                                                                                         | {}                                      |     |
@@ -57,6 +57,7 @@ The following table lists the configurable parameters of the process exporter ch
 | `serviceAccount.create`           | Specifies whether a service account should be created.                                                                        | `true`                                  |     |
 | `serviceAccount.name`             | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template |                                         |     |
 | `serviceAccount.imagePullSecrets` | Specify image pull secrets                                                                                                    | `[]`                                    |     |
+| `serviceMonitor.enabled`    | if `true`, creates a Prometheus Operator ServiceMonitor     | `false` |
 | `securityContext`                 | SecurityContext                                                                                                               | `{"runAsNonRoot": true, "runAsUser": 65534}` |     |
 | `affinity`                        | A group of affinity scheduling rules for pod assignment                                                                       | `{}`                                    |     |
 | `nodeSelector`                    | Node labels for pod assignment                                                                                                | `{}`                                    |     |

diff --git a/charts/prometheus-process-exporter/Chart.yaml b/charts/prometheus-process-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.4.0"
 description: A Helm chart for prometheus process-exporter
 name: prometheus-process-exporter
-version: 0.1.0
+version: 0.2.0
 home: https://github.com/mumoshu/prometheus-process-exporter
 sources:
 - https://github.com/ncabatoff/process-exporter

diff --git a/charts/prometheus-process-exporter/values.yaml b/charts/prometheus-process-exporter/values.yaml
@@ -6,6 +6,24 @@ image:
   tag: 0.4.0
   pullPolicy: IfNotPresent
 
+## Specify entries of `process_names:` in the process-expoter config
+## See https://github.com/ncabatoff/process-exporter/tree/master#using-a-config-file
+groups:
+- comm:
+  - chronyd
+- comm:
+  - bash
+- comm:
+  - rsync
+- comm:
+  - scp
+- comm:
+  - ssh
+
+## Creates a Prometheus Operator ServiceMonitor
+serviceMonitor:
+  enabled: false
+
 service:
   type: ClusterIP
   port: 9100
@@ -89,20 +107,6 @@ extraHostVolumeMounts: {}
 #    readOnly: true|false
 #    mountPropagation: None|HostToContainer|Bidirectional
 
-## Specify entries of `process_names:` in the process-expoter config
-## See https://github.com/ncabatoff/process-exporter/tree/master#using-a-config-file
-groups:
-- comm:
-  - chronyd
-- comm:
-  - bash
-- comm:
-  - rsync
-- comm:
-  - scp
-- comm:
-  - ssh
-
 templates:
   config.yml: |
     process_names: