Merge pull request #80 from raffis/chore-1

v2.0.0 release chore

Author: raffis

.goreleaser.yaml

@@ -2,7 +2,7 @@ project_name: mongodb-query-exporter
 
 builds:
 - id: cli
-  main: main.go
+  main: cmd/root.go
   binary: mongodb-query-exporter
   goos:
   - linux

Makefile

@@ -53,11 +53,11 @@ vet:
 
 build:
 	@echo ">> building binaries"
-	go build -o mongodb-query-exporter main.go
+	go build -o mongodb-query-exporter cmd/root.go
 
 .PHONY: run
 run: fmt vet
-	go run ./main.go
+	go run ./cmd/root.go
 
 .PHONY: docker-build
 docker-build: test ## Build docker image with the manager.

README.md

@@ -18,11 +18,11 @@ Note that this is not designed to be a replacement for the [MongoDB exporter](ht
 
 ## Installation
 
-Get Prometheus MongoDB aggregation query exporter, either as a [binary](https://github.com/raffis/mongodb-query-exporter/releases/tag/v1.0.0) from the latest release or packaged as a [Docker image](https://github.com/raffis/mongodb-query-exporter/pkgs/container/mongodb-query-exporter).
+Get Prometheus MongoDB aggregation query exporter, either as a binaray from the latest release or packaged as a [Docker image](https://github.com/raffis/mongodb-query-exporter/pkgs/container/mongodb-query-exporter).
 
 ### Helm Chart
 For kubernetes users there is an official helm chart for the MongoDB query exporter.
-Please read the installation instructions [here](https://github.com/raffis/mongodb-query-exporter/blob/master/chart/prometheus-mongodb-query-exporter/README.md).
+Please read the installation instructions [here](https://github.com/raffis/mongodb-query-exporter/blob/master/chart/mongodb-query-exporter/README.md).
 
 ## Usage
 

chart/mongodb-query-exporter/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v1.0.0
+appVersion: v2.0.0
 description: A Prometheus exporter for MongoDB custom aggregations
 home: https://github.com/raffis/mongodb-query-exporter
 maintainers:
@@ -12,7 +12,7 @@ keywords:
 - aggregation
 - query
 - prometheus
-name: prometheus-mongodb-query-exporter
+name: mongodb-query-exporter
 sources:
 - https://github.com/raffis/mongodb-query-exporter
 version: 2.1.0

chart/mongodb-query-exporter/README.md

@@ -1,4 +1,4 @@
-# Prometheus MongoDB Exporter
+# MongoDB Exporter
 
 Installs the [MongoDB Query Exporter](https://github.com/raffis/mongodb-query-exporter) for [Prometheus](https://prometheus.io/).
 
@@ -36,5 +36,5 @@ podAnnotations:
 See Customizing the Chart Before Installing. To see all configurable options with detailed comments, visit the chart's values.yaml, or run the configuration command:
 
 ```sh
-$ helm show values prometheus-mongodb-query-exporter/prometheus-mongodb-query-exporter
+$ helm show values oci://ghcr.io/raffis/charts/mongodb-query-exporter
 ```

chart/mongodb-query-exporter/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "prometheus-mongodb-query-exporter.name" -}}
+{{- define "mongodb-query-exporter.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "prometheus-mongodb-query-exporter.fullname" -}}
+{{- define "mongodb-query-exporter.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "prometheus-mongodb-query-exporter.chart" -}}
+{{- define "mongodb-query-exporter.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "prometheus-mongodb-query-exporter.serviceAccountName" -}}
+{{- define "mongodb-query-exporter.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "prometheus-mongodb-query-exporter.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "mongodb-query-exporter.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
@@ -45,34 +45,34 @@ Create the name of the service account to use
 {{/*
 Determine secret name, can either be the self-created of an existing one
 */}}
-{{- define "prometheus-mongodb-query-exporter.secretName" -}}
+{{- define "mongodb-query-exporter.secretName" -}}
 {{- if .Values.existingSecret.name -}}
     {{- .Values.existingSecret.name -}}
 {{- else -}}
-    {{ include "prometheus-mongodb-query-exporter.fullname" . }}
+    {{ include "mongodb-query-exporter.fullname" . }}
 {{- end -}}
 {{- end -}}
 
 {{/*
 Determine configmap name, can either be the self-created of an existing one
 */}}
-{{- define "prometheus-mongodb-query-exporter.configName" -}}
+{{- define "mongodb-query-exporter.configName" -}}
 {{- if .Values.existingConfig.name -}}
     {{- .Values.existingConfig.name -}}
 {{- else -}}
-    {{ include "prometheus-mongodb-query-exporter.fullname" . }}
+    {{ include "mongodb-query-exporter.fullname" . }}
 {{- end -}}
 {{- end -}}
 
 
 {{/*
 Common labels
 */}}
-{{- define "prometheus-mongodb-query-exporter.labels" -}}{{- if .Values.chartLabels }}
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
+{{- define "mongodb-query-exporter.labels" -}}{{- if .Values.chartLabels }}
+    app.kubernetes.io/name: {{ include "mongodb-query-exporter.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    helm.sh/chart: {{ include "mongodb-query-exporter.chart" . }}
 {{- end -}}
 {{- with .Values.labels }}
     {{ . | toYaml }}

chart/mongodb-query-exporter/templates/configmap.yaml

@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "prometheus-mongodb-query-exporter.configName" . }}
-  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
+  name: {{ include "mongodb-query-exporter.configName" . }}
+  {{- with ( include "mongodb-query-exporter.labels" . ) }}
   labels:
     {{- . }}
   {{- end }}

chart/mongodb-query-exporter/templates/deployment.yaml

@@ -1,8 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "prometheus-mongodb-query-exporter.fullname" . }}
-  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
+  name: {{ include "mongodb-query-exporter.fullname" . }}
+  {{- with ( include "mongodb-query-exporter.labels" . ) }}
   labels:
     {{- . }}
   {{- end }}
@@ -14,7 +14,7 @@ spec:
   replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
+      app.kubernetes.io/name: {{ include "mongodb-query-exporter.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
@@ -25,15 +25,15 @@ spec:
           {{- toYaml .Values.podAnnotations | nindent 8 }}
         {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
+        app.kubernetes.io/name: {{ include "mongodb-query-exporter.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
-      serviceAccountName: {{ template "prometheus-mongodb-query-exporter.serviceAccountName" . }}
+      serviceAccountName: {{ template "mongodb-query-exporter.serviceAccountName" . }}
       containers:
       - name: mongodb-query-exporter
         envFrom:
         - secretRef:
-            name: {{ include "prometheus-mongodb-query-exporter.secretName" . }}
+            name: {{ include "mongodb-query-exporter.secretName" . }}
         env:
         {{- if .Values.env }}
         {{- range $key, $value := .Values.env }}
@@ -95,7 +95,7 @@ spec:
       volumes:
       - name: config
         configMap:
-          name: {{ include "prometheus-mongodb-query-exporter.configName" . }}
+          name: {{ include "mongodb-query-exporter.configName" . }}
       {{- range .Values.secretMounts }}
       - name: {{ .name }}
         secret:

chart/mongodb-query-exporter/templates/podmonitor.yaml

@@ -2,8 +2,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ include "prometheus-mongodb-query-exporter.fullname" . }}
-  {{- $labels := merge ( include "prometheus-mongodb-query-exporter.labels" . | fromYaml) .Values.podMonitor.labels -}}
+  name: {{ include "mongodb-query-exporter.fullname" . }}
+  {{- $labels := merge ( include "mongodb-query-exporter.labels" . | fromYaml) .Values.podMonitor.labels -}}
   {{- with $labels }}
   labels:
     {{- toYaml . | nindent 4 }}
@@ -30,7 +30,7 @@ spec:
     - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
+      app.kubernetes.io/name: {{ include "mongodb-query-exporter.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.podMonitor.targetLabels }}
   targetLabels:

chart/mongodb-query-exporter/templates/podsecuritypolicy.yaml

@@ -2,8 +2,8 @@
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: {{ template "prometheus-mongodb-query-exporter.fullname" . }}
-  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
+  name: {{ template "mongodb-query-exporter.fullname" . }}
+  {{- with ( include "mongodb-query-exporter.labels" . ) }}
   labels:
     {{- . }}
   {{- end }}