Separate collectorset controller and argus charts

argus/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Automated Kubernetes monitoring
 name: argus
-version: 0.2.0
+version: 0.3.0
 maintainers:
-- name: Andrew Rynhard
-  email: andrew.rynhard@logicmonitor.com
+- name: LogicMonitor
+  email: argus@logicmonitor.com

argus/README.md

@@ -3,31 +3,39 @@
 This Helm chart installs [Argus](https://github.com/logicmonitor/k8s-argus). A [LogicMonitor](https://www.logicmonitor.com) account is required.
 
 ```bash
-$ helm upgrade
+$ helm upgrade \
   --install \
   --debug \
   --wait \
-  --tiller-namespace $NAMESPACE \
-  --set accessID='$ACCESS_ID' \
-  --set accessKey='$ACCESS_KEY' \
-  --set account='$ACCOUNT' \
-  --set clusterName='$CLUSTER_NAME' \
-  --set collectorDescription='$COLLECTOR_DESCRIPTION' \
-  --set collectorImageTag='$COLLECTORIMAGETAG' \
-  --set collectorSize='$COLLECTORSIZE' \
-  --set etcdDiscoveryToken='$ETCD_DISCOVERY_TOKEN' \
-  --set imageTag='$IMAGE_TAG' \
+  --tiller-namespace="$NAMESPACE" \
+  --set accessID="$ACCESS_ID" \
+  --set accessKey="$ACCESS_KEY" \
+  --set account="$ACCOUNT" \
+  --set clusterName="$CLUSTER_NAME" \
+  --set etcdDiscoveryToken="$ETCD_DISCOVERY_TOKEN" \
+  --set imageTag="$IMAGE_TAG" \
+  --set collector.replicas="$COLLECTOR_REPLICAS" \
+  --set collector.size="$COLLECTOR_SIZE" \
   argus logicmonitor/argus
 ```
 
-Values:
--   **accessID:** The LogicMonitor API key ID.
--   **accessKey:** The LogicMonitor API key.
--   **account:** The LogicMonitor account name.
--   **clusterName:** A unique name given to the cluster's device group.
--   **collectorDescription:** A unique collector description used to look up a collector dynamically.
--   **collectorImageTag:** The collector image tag.
--   **collectorSize:** The collector size to install. Can be nano, small, medium, or large.
--   **etcdDiscoveryToken:** The public etcd discovery token used to add etcd hosts to the cluster device group.
--   **imageTag:** The argus image tag to use.
--   **useEACollector:** Use an early access collector.
+Required Values:
+
+- **accessID:** The LogicMonitor API key ID.
+- **accessKey:** The LogicMonitor API key.
+- **account:** The LogicMonitor account name.
+- **clusterName:** A unique name given to the cluster's device group.
+- **collector.replicas:** The number of collectors to create and use with Argus.
+- **collector.size:** The collector size to install. Can be nano, small, medium, or large.
+- **etcdDiscoveryToken:** The public etcd discovery token used to add etcd hosts to the cluster device group.
+
+Optional Values:
+
+- **debug (default: `false`):** Enable debug logging.
+- **deleteDevices (default: `true`):** On a delete event, either delete from LogicMonitor or move the device to the `_delted` device group.
+- **disableAlerting (default: `false`):** Disable alerting for all devices added.
+- **enableRBAC (default: `true`):** Enable RBAC.
+- **etcdDiscoveryToken:** The public etcd discovery token used to add etcd hosts to the cluster device group.
+- **imagePullPolicy (default: `"Always"`):**
+- **imageRepository (default: `"logicmonitor/argus"`):** The respository to use for the Argus docker image.
+- **imageTag:** The argus container image tag to use.

argus/templates/collectorset.yaml

@@ -0,0 +1,11 @@
+apiVersion: logicmonitor.com/v1alpha1
+kind: CollectorSet
+metadata:
+  name: {{ .Values.clusterName }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  policy:
+    distributionStrategy: RoundRobin
+    orchestrator: Kubernetes
+  replicas: {{ required "A valid .Values.collector.replicas entry is required!" .Values.collector.replicas }}
+  size: {{ required "A valid .Values.collector.size entry is required!" .Values.collector.size }}

argus/templates/secret.yaml

@@ -4,7 +4,7 @@ metadata:
   name: argus
 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 }}
+  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 }}
   etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}

argus/values.yaml

@@ -7,3 +7,4 @@ debug: false
 enableRBAC: true
 nodeSelector: {}
 affinity: {}
+collector: {}

argus/charts/collectorset-controller/Chart.yaml → collectorset-controller/Chart.yaml

@@ -3,5 +3,5 @@ description: Automated collector management
 name: collectorset-controller
 version: 0.1.0
 maintainers:
-- name: Andrew Rynhard
-  email: andrew.rynhard@logicmonitor.com
+- name: LogicMonitor
+  email: argus@logicmonitor.com

collectorset-controller/README.md

@@ -0,0 +1,33 @@
+# collectorset-controller
+
+This Helm chart installs [collectorset-controller](https://github.com/logicmonitor/k8s-collectorset-controller). A [LogicMonitor](https://www.logicmonitor.com) account is required.
+
+```bash
+$ helm upgrade \
+  --install \
+  --debug \
+  --wait \
+  --tiller-namespace="$NAMESPACE" \
+  --set accessID="$ACCESS_ID" \
+  --set accessKey="$ACCESS_KEY" \
+  --set account="$ACCOUNT" \
+  --set clusterName="$CLUSTER_NAME" \
+  --set etcdDiscoveryToken="$ETCD_DISCOVERY_TOKEN" \
+  --set imageTag="$IMAGE_TAG" \
+  collectorset-controller logicmonitor/collectorset-controller
+```
+
+Required Values:
+
+- **accessID:** The LogicMonitor API key ID.
+- **accessKey:** The LogicMonitor API key.
+- **account:** The LogicMonitor account name.
+- **clusterName:** A unique name given to the cluster's device group.
+
+Optional Values:
+
+- **enableRBAC (default: `true`):** Enable RBAC.
+- **etcdDiscoveryToken:** The public etcd discovery token used to add etcd hosts to the cluster device group.
+- **imagePullPolicy (default: `"Always"`):**
+- **imageRepository (default: `"logicmonitor/collectorset-controller"`):** The respository to use for the Argus docker image.
+- **imageTag:** The collectorset-controller image tag to use.

collectorset-controller/templates/crd.yaml

@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: collectorsets.logicmonitor.com
+spec:
+  group: logicmonitor.com
+  names:
+    kind: CollectorSet
+    listKind: CollectorSetList
+    plural: collectorsets
+    singular: collectorset
+  scope: Namespaced
+  version: v1alpha1

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.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 }}
+  etcdDiscoveryToken: {{ default "" .Values.etcdDiscoveryToken | b64enc | quote }}

docs/index.yaml

@@ -2,7 +2,18 @@ apiVersion: v1
 entries:
   argus:
   - apiVersion: v1
-    created: 2018-08-09T13:35:03.693116-05:00
+    created: 2018-09-05T11:39:03.745065-07:00
+    description: Automated Kubernetes monitoring
+    digest: 92a0d65fe6ec5c1bc1adb81394fb00e0aec73740e41f0a64ad6c3a680c8633f7
+    maintainers:
+    - email: [email protected]
+      name: LogicMonitor
+    name: argus
+    urls:
+    - https://logicmonitor.github.com/k8s-helm-charts/argus-0.3.0.tgz
+    version: 0.3.0
+  - apiVersion: v1
+    created: 2018-09-05T11:39:03.744805-07:00
     description: Automated Kubernetes monitoring
     digest: 316c7c7d17085a65027667ef4a053062c3b2304b12f2f7e178b1f633baef73b0
     maintainers:
@@ -13,7 +24,7 @@ entries:
     - https://logicmonitor.github.com/k8s-helm-charts/argus-0.2.0.tgz
     version: 0.2.0
   - apiVersion: v1
-    created: 2018-08-09T13:35:03.692624-05:00
+    created: 2018-09-05T11:39:03.744436-07:00
     description: Automated Kubernetes monitoring
     digest: b5e475acc633064f72e56d604bceb181920e194372807ed7e7384b4b75a8a8eb
     maintainers:
@@ -25,12 +36,12 @@ entries:
     version: 0.1.0
   releasemanager:
   - apiVersion: v1
-    created: 2018-08-09T13:35:03.693573-05:00
+    created: 2018-09-05T11:39:03.745377-07:00
     description: Release Manager provides a long-running application that will periodically
       poll the Tiller server installed in your cluster.
     digest: dbcac371af7b29c4c5d6e9fc02ddf65b7093109c45fa3875b7f5b259d71f87ca
     name: releasemanager
     urls:
     - https://logicmonitor.github.com/k8s-helm-charts/releasemanager-0.1.0.tgz
     version: 0.1.0
-generated: 2018-08-09T13:35:03.692025-05:00
+generated: 2018-09-05T11:39:03.743975-07:00