Add argus 0.2.0 chart

argus/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Automated Kubernetes monitoring
 name: argus
-version: 0.1.0
+version: 0.2.0
 maintainers:
 - name: Andrew Rynhard
   email: [email protected]

argus/charts/collectorset-controller/Chart.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+description: Automated collector management
+name: collectorset-controller
+version: 0.1.0
+maintainers:
+- name: Andrew Rynhard
+  email: [email protected]

argus/charts/collectorset-controller/templates/NOTES.txt

@@ -0,0 +1,2 @@
+1. View the logs for Argus by running this command:
+kubectl logs -f $(kubectl get pods --namespace={{ .Release.Namespace }} -l app=argus -o name) -c argus -n {{ .Release.Namespace }}

argus/charts/collectorset-controller/templates/_helpers.tpl

@@ -0,0 +1,15 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "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).
+*/}}
+{{- define "fullname" -}}
+{{- printf "%s" .Release.Name -}}
+{{- end -}}

argus/charts/collectorset-controller/templates/configmap.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: collectorset-controller
+data:
+  config.yaml: |
+    debug: {{ required "A valid .Values.debug entry is required!" .Values.debug }}

argus/charts/collectorset-controller/templates/deployment.yaml

@@ -0,0 +1,60 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: collectorset-controller
+  labels:
+    chart: "collectorset-controller"
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: collectorset-controller
+    spec:
+      serviceAccountName: collectorset-controller
+    {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+    {{- end }}
+    {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}
+      containers:
+      - name: collectorset-controller
+        image: "{{ .Values.imageRepository }}:{{ default "latest" .Values.imageTag }}"
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
+        env:
+        - name: ACCESS_ID
+          valueFrom:
+            secretKeyRef:
+              name: collectorset-controller
+              key: accessID
+        - name: ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: collectorset-controller
+              key: accessKey
+        - name: ACCOUNT
+          valueFrom:
+            secretKeyRef:
+              name: collectorset-controller
+              key: account
+        - name: ETCD_DISCOVERY_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: collectorset-controller
+              key: etcdDiscoveryToken
+        volumeMounts:
+        - name: etc-collectorset-controller
+          mountPath: "/etc/collectorset-controller"
+          readOnly: true
+      volumes:
+      - name: etc-collectorset-controller
+        projected:
+          sources:
+          - configMap:
+              name: collectorset-controller
+              items:
+                - key: config.yaml
+                  path: config.yaml

argus/charts/collectorset-controller/templates/rbac.yaml

@@ -0,0 +1,83 @@
+{{- if .Values.enableRBAC -}}
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: collectorset-controller
+rules:
+- apiGroups:
+    - ""
+  resources:
+    - pods
+  verbs:
+    - "*"
+- apiGroups:
+    - "apps"
+  resources:
+    - statefulsets
+  verbs:
+    - "*"
+- apiGroups:
+    - "*"
+  resources:
+    - collectorsets
+  verbs:
+    - "*"
+- apiGroups:
+    - apiextensions.k8s.io
+  resources:
+    - customresourcedefinitions
+  verbs:
+    - "*"
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: collectorset-controller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: collectorset-controller
+subjects:
+- kind: ServiceAccount
+  name: collectorset-controller
+  namespace: {{ .Release.Namespace }}
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: collector
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - containers
+  - nodes
+  - componentstatuses
+  - replicasets
+  - ingress
+  - services
+  verbs:
+  - list
+  - get
+- nonResourceURLs:
+  - /
+  - /healthz
+  - /healthz/*
+  verbs:
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: collector
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: collector
+subjects:
+- kind: ServiceAccount
+  name: collector
+  namespace: {{ .Release.Namespace }}
+{{- end -}}

argus/charts/collectorset-controller/templates/secret.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: collectorset-controller
+type: Opaque
+data:
+  accessID: {{ required "A valid .Values.global.accessID entry is required!" .Values.global.accessID | b64enc }}
+  accessKey: {{ required "A valid .Values.global.accessKey entry is required!" .Values.global.accessKey | b64enc }}
+  account: {{ required "A valid .Values.global.account entry is required!" .Values.global.account | b64enc }}
+  etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}

argus/charts/collectorset-controller/templates/service.yaml

@@ -0,0 +1,11 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: collectorset-controller
+spec:
+  selector:
+    app: collectorset-controller
+  ports:
+  - protocol: TCP
+    port: 50000
+    targetPort: 50000

argus/charts/collectorset-controller/templates/serviceaccount.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: collectorset-controller
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: collector
+  namespace: {{ .Release.Namespace }}

argus/charts/collectorset-controller/values.yaml

@@ -0,0 +1,7 @@
+imageRepository: logicmonitor/collectorset-controller
+imageTag: latest
+imagePullPolicy: Always
+debug: false
+enableRBAC: true
+nodeSelector: {}
+affinity: {}

argus/templates/configmap.yaml

@@ -4,9 +4,8 @@ metadata:
   name: argus
 data:
   config.yaml: |
+    address: collectorset-controller:50000
     cluster_name: {{ required "A valid .Values.clusterName entry is required!" .Values.clusterName }}
-    collector_description: {{ required "A valid .Values.collectorDescription entry is required!" .Values.collectorDescription }}
-    collector_escalation_chain_id: {{ .Values.collectorEscalatingChainID }}
     debug: {{ required "A valid .Values.debug entry is required!" .Values.debug }}
     delete_devices: {{ required "A valid .Values.deleteDevices entry is required!" .Values.deleteDevices }}
     disable_alerting: {{ required "A valid .Values.disableAlerting entry is required!" .Values.disableAlerting }}

argus/templates/deployment.yaml

@@ -51,33 +51,6 @@ spec:
         - name: etc-argus
           mountPath: "/etc/argus"
           readOnly: true
-      - name: collector
-        image: "logicmonitor/collector:{{ default "latest" .Values.collectorImageTag }}"
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
-        env:
-        - name: access_id
-          valueFrom:
-            secretKeyRef:
-              name: argus
-              key: accessID
-        - name: access_key
-          valueFrom:
-            secretKeyRef:
-              name: argus
-              key: accessKey
-        - name: account
-          valueFrom:
-            secretKeyRef:
-              name: argus
-              key: account
-        - name: collector_size
-          value: {{ default "small" .Values.collectorSize }}
-        - name: use_ea
-          value: {{ .Values.useEACollector | quote }}
-        - name: escalating_chain_id
-          value: {{ default 1 .Values.collectorEscalatingChainID | quote }}
-        - name: description
-          value: {{ required "A .Values.collectorDescription entry is required!" .Values.collectorDescription }}
       volumes:
       - name: etc-argus
         projected:

argus/templates/rbac.yaml

@@ -38,42 +38,4 @@ subjects:
 - kind: ServiceAccount
   name: argus
   namespace: {{ .Release.Namespace }}
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: collector
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  - containers
-  - nodes
-  - componentstatuses
-  - replicasets
-  - ingress
-  - services
-  verbs:
-  - list
-  - get
-- nonResourceURLs:
-  - /
-  - /healthz
-  - /healthz/*
-  verbs:
-  - get
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  name: collector
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: collector
-subjects:
-- kind: ServiceAccount
-  name: collector
-  namespace: {{ .Release.Namespace }}
 {{- end -}}

argus/templates/secret.yaml

@@ -4,7 +4,7 @@ metadata:
   name: argus
 type: Opaque
 data:
-  accessID: {{ required "A valid .Values.accessID entry is required!" .Values.accessID | b64enc }}
-  accessKey: {{ required "A valid .Values.accessKey entry is required!" .Values.accessKey | b64enc }}
-  account: {{ required "A valid .Values.account entry is required!" .Values.account | b64enc }}
+  accessID: {{ required "A valid .Values.global.accessID entry is required!" .Values.global.accessID | b64enc }}
+  accessKey: {{ required "A valid .Values.global.accessKey entry is required!" .Values.global.accessKey | b64enc }}
+  account: {{ required "A valid .Values.global.account entry is required!" .Values.global.account | b64enc }}
   etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}

argus/templates/serviceaccount.yaml

@@ -1,12 +1,6 @@
 ---
 apiVersion: v1
 kind: ServiceAccount
-metadata:
-  name: collector
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-kind: ServiceAccount
 metadata:
   name: argus
   namespace: {{ .Release.Namespace }}

argus/values.yaml

@@ -1,13 +1,9 @@
-replicaCount: 1
-argus:
 imageRepository: logicmonitor/argus
 imageTag: latest
 imagePullPolicy: Always
-collectorSize: small
 disableAlerting: false
-deleteDevices: false
+deleteDevices: true
 debug: false
 enableRBAC: true
-useEACollector: false
 nodeSelector: {}
 affinity: {}

docs/index.yaml

@@ -2,7 +2,18 @@ apiVersion: v1
 entries:
   argus:
   - apiVersion: v1
-    created: 2017-09-26T08:40:01.449357547-07:00
+    created: 2017-10-20T14:20:33.188468558-07:00
+    description: Automated Kubernetes monitoring
+    digest: b18c13ea4c932a849833b522ac26d83ff1d0e0cf40792e5e552763cd927c0a7f
+    maintainers:
+    - email: [email protected]
+      name: Andrew Rynhard
+    name: argus
+    urls:
+    - https://logicmonitor.github.com/k8s-helm-charts/argus-0.2.0.tgz
+    version: 0.2.0
+  - apiVersion: v1
+    created: 2017-10-20T14:20:33.188001192-07:00
     description: Automated Kubernetes monitoring
     digest: b5e475acc633064f72e56d604bceb181920e194372807ed7e7384b4b75a8a8eb
     maintainers:
@@ -12,4 +23,4 @@ entries:
     urls:
     - https://logicmonitor.github.com/k8s-helm-charts/argus-0.1.0.tgz
     version: 0.1.0
-generated: 2017-09-26T08:40:01.4489001-07:00
+generated: 2017-10-20T14:20:33.187245024-07:00