Compare commits

...

12 Commits

13 changed files with 377 additions and 40 deletions

View File

@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "0.2"
description: Pulls data from the AAISP CHAOSv2 API into MQTT
name: aaisp-to-mqtt
version: 0.1.0
version: 0.2.4

View File

@@ -15,10 +15,16 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
spec:
concurrencyPolicy: {{ .Values.cronjob.concurrencyPolicy }}
schedule: {{ .Values.cronjob.schedule | quote }}
successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
concurrencyPolicy: Forbid
{{- if .Values.cronjob.startingDeadlineSeconds }}
startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
{{- end }}
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
@@ -28,63 +34,56 @@ spec:
app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
spec:
restartPolicy: Never
{{- if (default .Values.image.pullSecrets .Values.cronjob.image.pullSecrets) }}
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range (default .Values.image.pullSecrets .Values.cronjob.image.pullSecrets) }}
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ default .Values.image.repository .Values.cronjob.image.repository }}:{{ default .Values.image.tag .Values.cronjob.image.tag }}"
imagePullPolicy: {{ default .Values.image.pullPolicy .Values.cronjob.image.pullPolicy }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{ toYaml .Values.resources | indent 16 }}
env:
- name: AAISP_USERNAME
valueFrom:
secretKeyRef:
name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
key: aaisp.username
- name: AAISP_PASSWORD
valueFrom:
secretKeyRef:
name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
key: aaisp.password
- name: MQTT_BROKER
value: {{ .Values.mqtt.broker }}
- name: MQTT_PORT
value: {{- default 1883 .Values.mqtt.port }}
{{- .Values.mqtt.authenticated }}
value: "{{ default 1883 .Values.mqtt.port }}"
{{- if .Values.mqtt.authenticated }}
- name: MQTT_USERNAME
valueFrom:
secretKeyRef:
name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
key: mqtt.username
- name: MQTT_PASSWORD
valueFrom:
secretKeyRef:
name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
key: mqtt.password
{{- end }}
- name: MQTT_TOPIC_PREFIX
value: {{ default "aaisp" .Values.mqtt.topicPrefix }}
resources:
{{ toYaml (default .Values.resources .Values.cronjob.resources) | indent 16 }}
{{- with (default .Values.nodeSelector .Values.cronjob.nodeSelector) }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 12 }}
{{- end }}
{{- with (default .Values.affinity .Values.cronjob.affinity) }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 12 }}
{{- end }}
{{- with (default .Values.tolerations .Values.cronjob.tolerations) }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 12 }}:
{{- end }}
schedule: {{ .Values.schedule | quote }}
successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
concurrencyPolicy: Forbid
{{- if .Values.cronjob.startingDeadlineSeconds }}
startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
{{- end }}

View File

@@ -1,5 +1,5 @@
{{- if Not(.Values.cronjob.existingSecretName) }}
---
{{- if not (.Values.existingSecretName) }}
apiVersion: v1
kind: Secret
metadata:
@@ -11,10 +11,10 @@ metadata:
app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
type: Opaque
data:
aaisp.username: {{ .Values.aaisp.username }}
aaisp.password: {{ .Values.aaisp.password }}
aaisp.username: {{ .Values.aaisp.username | b64enc }}
aaisp.password: {{ .Values.aaisp.password | b64enc }}
{{- if .Values.mqtt.authenticated }}
mqtt.username: {{ .Values.mqtt.username }}
mqtt.password: {{ .Values.mqtt.password }}
mqtt.username: {{ .Values.mqtt.username | b64enc }}
mqtt.password: {{ .Values.mqtt.password | b64enc }}
{{- end }}
{{- end }}

View File

@@ -6,10 +6,10 @@ replicaCount: 1
image:
repository: nikdoof/aaisp-to-mqtt
tag: latest
tag: 0.2.3
pullPolicy: IfNotPresent
# imagePullSecrets: []
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
@@ -19,7 +19,7 @@ fullnameOverride: ""
## Connection details
##
aaisp:
aaisp: {}
# username: user1@a
# password: password
@@ -32,15 +32,10 @@ mqtt:
# topicPrefix: aaisp
cronjob:
schedule: "*/10 * * *"
schedule: "*/10 * * * *"
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 1
# startingDeadlineSeconds: 10
# imagePullSecrets: []
# resources: {}
# nodeSelector: {}
# tolerations: []
# affinity: {}
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious

View File

@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 0.6.6-ls58
description: A simple web viewer for Calibre libraries
name: calibre-web
version: 1.1.1
version: 1.1.2
keywords:
- calibre-web
- calibre

View File

@@ -61,7 +61,7 @@ spec:
value: "{{ .Values.puid }}"
- name: PGID
value: "{{ .Values.pgid }}"
{{- if .values.dockerMods }}
{{- if .Values.dockerMods }}
- name: DOCKER_MODS
value: {{ .Values.dockerMods }}
{{- end }}

View File

@@ -0,0 +1,22 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/

View File

@@ -0,0 +1,5 @@
apiVersion: v1
appVersion: "0.8.5"
description: Collect VMware vCenter and ESXi performance metrics and send them to InfluxDB
name: vsphere-influxdb-go
version: 0.1.0

View File

@@ -0,0 +1,56 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "vsphere-influxdb-go.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
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 "vsphere-influxdb-go.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "vsphere-influxdb-go.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "vsphere-influxdb-go.labels" -}}
app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Create the name of the service account to use
*/}}
{{- define "vsphere-influxdb-go.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "vsphere-influxdb-go.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

View File

@@ -0,0 +1,86 @@
---
apiVersion: v1
data:
config.json: "{\r\n \"Domain\": \".lab\",\r\n \"RemoveHostDomainName\": false,\r\n
\ \"Interval\": 60,\r\n \"VCenters\": [],\r\n \"InfluxDB\": {\r\n \"Prefix\":
\"vsphere_\",\r\n \"Hostname\": \"http://influxdb:8086\",\r\n \"Database\":
\"vmware_performance\"\r\n },\r\n \"Metrics\": [\r\n {\r\n \"ObjectType\":
[\r\n \"VirtualMachine\",\r\n \"HostSystem\"\r\n
\ ],\r\n \"Definition\": [\r\n {\r\n \"Metric\":
\"cpu.usage.average\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"cpu.usage.maximum\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"cpu.usagemhz.average\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"cpu.usagemhz.maximum\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"cpu.wait.summation\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"cpu.system.summation\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"cpu.ready.summation\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"mem.usage.average\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"mem.usage.maximum\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"mem.consumed.average\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"mem.consumed.maximum\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"mem.active.average\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"mem.active.maximum\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"mem.vmmemctl.average\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"mem.vmmemctl.maximum\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"mem.totalCapacity.average\",\r\n \"Instances\": \"*\"\r\n
\ },\r\n {\r\n \"Metric\": \"net.packetsRx.summation\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"net.packetsTx.summation\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"net.throughput.usage.average\",\r\n \"Instances\": \"*\"\r\n
\ },\r\n {\r\n \"Metric\": \"net.received.average\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"net.transmitted.average\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"net.throughput.usage.nfs.average\",\r\n \"Instances\": \"*\"\r\n
\ },\r\n {\r\n \"Metric\": \"datastore.numberReadAveraged.average\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"datastore.numberWriteAveraged.average\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"datastore.read.average\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"datastore.write.average\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"datastore.totalReadLatency.average\",\r\n
\ \"Instances\": \"*\"\r\n },\r\n {\r\n
\ \"Metric\": \"datastore.totalWriteLatency.average\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"mem.capacity.provisioned.average\",\r\n \"Instances\": \"*\"\r\n
\ },\r\n {\r\n \"Metric\": \"cpu.corecount.provisioned.average\",\r\n
\ \"Instances\": \"*\"\r\n }\r\n ]\r\n
\ },\r\n {\r\n \"ObjectType\": [\r\n \"VirtualMachine\"\r\n
\ ],\r\n \"Definition\": [\r\n {\r\n \"Metric\":
\"datastore.datastoreVMObservedLatency.latest\",\r\n \"Instances\":
\"*\"\r\n }\r\n ]\r\n },\r\n {\r\n \"ObjectType\":
[\r\n \"HostSystem\"\r\n ],\r\n \"Definition\":
[\r\n {\r\n \"Metric\": \"disk.maxTotalLatency.latest\",\r\n
\ \"Instances\": \"\"\r\n },\r\n {\r\n
\ \"Metric\": \"disk.numberReadAveraged.average\",\r\n \"Instances\":
\"*\"\r\n },\r\n {\r\n \"Metric\":
\"disk.numberWriteAveraged.average\",\r\n \"Instances\": \"*\"\r\n
\ },\r\n {\r\n \"Metric\": \"net.throughput.contention.summation\",\r\n
\ \"Instances\": \"*\"\r\n }\r\n ]\r\n
\ },\r\n {\r\n \"ObjectType\": [\r\n \"Datastore\"\r\n
\ ],\r\n \"Definition\": [\r\n {\r\n \"Metric\":
\"disk.capacity.latest\",\r\n \"Instances\": \"*\"\r\n },\r\n
\ {\r\n \"Metric\": \"disk.used.latest\",\r\n
\ \"Instances\": \"*\"\r\n }\r\n ]\r\n
\ }\r\n ]\r\n}"
kind: ConfigMap
metadata:
name: vsphere-influxdb-go-config
labels:
app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}

View File

@@ -0,0 +1,98 @@
---
apiVersion: batch/v1beta1
kind: CronJob
metadata:
name: {{ include "vsphere-influxdb-go.fullname" . }}-cronjob
{{- if .Values.deploymentAnnotations }}
annotations:
{{- range $key, $value := .Values.deploymentAnnotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
labels:
app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
spec:
schedule: {{ .Values.cronjob.schedule | quote }}
successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
concurrencyPolicy: Forbid
{{- if .Values.cronjob.startingDeadlineSeconds }}
startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
{{- end }}
jobTemplate:
spec:
backoffLimit: 0
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
spec:
restartPolicy: Never
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
command: ["/vsphere-influxdb-go", "-config=/config/config.json"]
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{ toYaml .Values.resources | indent 16 }}
env:
- name: VSPHERE_HOSTNAME
value: {{ .Values.vsphere.hostname }}
- name: VSPHERE_USERNAME
valueFrom:
secretKeyRef:
name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
key: vsphere.username
- name: VSPHERE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
key: vsphere.password
- name: INFLUX_HOSTNAME
value: {{ .Values.influxdb.hostname }}
- name: INFLUX_DATABASE
value: {{ .Values.influxdb.database }}
{{- if .Values.influxdb.authenticated }}
- name: INFLUX_USERNAME
valueFrom:
secretKeyRef:
name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
key: influxdb.username
- name: INFLUX_PASSWORD
valueFrom:
secretKeyRef:
name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
key: influxdb.password
{{- end }}
volumeMounts:
- name: config-volume
mountPath: /config
volumes:
- name: config-volume
configMap:
name: vsphere-influxdb-go-config
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 12 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 12 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{ toYaml . | indent 12 }}:
{{- end }}

View File

@@ -0,0 +1,20 @@
---
{{- if not (.Values.existingSecretName) }}
apiVersion: v1
kind: Secret
metadata:
name: vsphere-influxdb-go-secret
labels:
app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
type: Opaque
data:
vsphere.username: {{ .Values.vsphere.username | b64enc }}
vsphere.password: {{ .Values.vsphere.password | b64enc }}
{{- if .Values.influxdb.authenticated }}
influxdb.username: {{ .Values.influxdb.username | b64enc }}
influxdb.password: {{ .Values.influxdb.password | b64enc }}
{{- end }}
{{- end }}

View File

@@ -0,0 +1,56 @@
# Default values for vsphere-influxdb-go.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
image:
repository: nikdoof/vsphere-influxdb-go
tag: latest
pullPolicy: IfNotPresent
# imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
## Use a pre-existing secret for login information
##
# existingSecretName: existing-secret
## Connection details
##
vsphere:
hostname:
username:
password:
influxdb:
hostname: http://influxdb:8086
authenticated: false
# username:
# password:
database: vmware_performance
cronjob:
schedule: "* * * * *"
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 1
# startingDeadlineSeconds: 10
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector: {}
tolerations: []
affinity: {}