feat(argus): add new config parameters to modify by users

enable preview mode for new resource group tree
generic filter to exclude resource using lm.monitor=disable label

Squashed commit of the following:

commit d734fdd222387c963f50886917d5f90bf8fd5a4e
Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com>
Date:   Tue Jun 29 15:06:46 2021 +0530

    dev-vk: rebuilt

commit 161e1d0699685ff8700638825a1e291e787408a5
Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com>
Date:   Tue Jun 29 12:17:23 2021 +0530

    dev-vk: something

commit 491d25ba924c1d3987e778b0ed27cf6a77dd32ff
Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com>
Date:   Thu Jun 24 21:57:54 2021 +0530

    dev-vk: cache sync to 1h

commit 778e40a790d48f3ba6a596075f4798e551cddb84
Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com>
Date:   Thu Jun 24 21:19:50 2021 +0530

    dev-vk: something

commit fed7e7e4355f9b8dd3c5be900d13319915d54785
Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com>
Date:   Wed Jun 23 15:48:47 2021 +0530

    dev-vk: something

commit 5e287b114376416164dd13ff36e2d5fb1d609bdd
Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com>
Date:   Wed Jun 23 15:48:26 2021 +0530

    dev-vk: something

argus/README.md

@@ -28,9 +28,9 @@ Required Values:
 - **accessID (default: `""`):** The LogicMonitor API key ID.
 - **accessKey (default: `""`):** The LogicMonitor API key.
 - **account (default: `""`):** The LogicMonitor account name.
-- **clusterName (default: `""`):** A unique name given to the cluster's device group.
+- **clusterName (default: `""`):** A unique name given to the cluster's resource group.
 - **debug (default: `false`):** To enable verbose logging at debug level.
-- **deleteDevices (default: `true`):** On a delete event, either delete from LogicMonitor or move the device to the `_deleted` device group.
+- **deleteDevices (default: `true`):** On a delete event, either delete from LogicMonitor or move the resource to the `_deleted` resource group.
 - **disableAlerting (default: `false`):** Disables LogicMonitor alerting for all the cluster resources.
 - **collector.replicas (default: `1`):** The number of collectors to create and use with Argus.
 - **collector.size (default: `""`):** The collector size to install. Can be nano, small, medium, or large.
@@ -42,8 +42,8 @@ Required Values:
 Optional Values:
 
 - **enableRBAC (default: `true`):** Enable RBAC. If your cluster does not have RBAC enabled, this value should be set to false.
-- **clusterGroupID (default: `0`):** A parent group id of the cluster's device group.
-- **etcdDiscoveryToken (default: `""`):** The public etcd discovery token used to add etcd hosts to the cluster device group.
+- **clusterGroupID (default: `0`):** A parent group id of the cluster's resource group.
+- **etcdDiscoveryToken (default: `""`):** The public etcd discovery token used to add etcd hosts to the cluster resource group.
 - **imagePullPolicy (default: `"Always"`):** The image pull policy of the Argus container.
 - **imageRepository (default: `"logicmonitor/argus"`):** The image respository of the [Argus](https://hub.docker.com/r/logicmonitor/argus) container.
 - **imageTag:** The image tag of the [Argus](https://hub.docker.com/r/logicmonitor/argus/tags) container.
@@ -54,10 +54,10 @@ Optional Values:
 - **affinity (default: `{}`):** It allows you to constrain which nodes your pod is eligible to be scheduled on.
 - **priorityClassName (default: `""`):** The priority class name for Pod priority. If this parameter is set then user must have PriorityClass resource created otherwise Pod will be rejected.
 - **tolerations (default: `[]`):** Tolerations are applied to pods, and allow the pods to schedule onto nodes with matching taints.
-- **filters.pod (default: `""`):** The filtered expression for Pod device type. Based on this parameter, Pods would be added/deleted for discovery on LM.
-- **filters.service (default: `""`):** The filtered expression for Service device type. Based on this parameter, Services would be added/deleted for discovery on LM.
-- **filters.node (default: `""`):** The filtered expression for Node device type. Based on this parameter, Nodes would be added/deleted for discovery on LM.
-- **filters.deployment (default: `""`):** The filtered expression for Deployment device type. Based on this parameter, Deployments would be added/deleted for discovery on LM.
+- **filters.pod (default: `""`):** The filtered expression for Pod resource type. Based on this parameter, Pods would be added/deleted for discovery on LM.
+- **filters.service (default: `""`):** The filtered expression for Service resource type. Based on this parameter, Services would be added/deleted for discovery on LM.
+- **filters.node (default: `""`):** The filtered expression for Node resource type. Based on this parameter, Nodes would be added/deleted for discovery on LM.
+- **filters.deployment (default: `""`):** The filtered expression for Deployment resource type. Based on this parameter, Deployments would be added/deleted for discovery on LM.
 - **collector.groupID (default: `0`):** The ID of the group of the collectors.
 - **collector.escalationChainID (default: `0`):** The ID of the escalation chain of the collectors.
 - **collector.collectorVersion (default: `0`):** The version of the collectors.

argus/templates/configmap.yaml

@@ -21,11 +21,29 @@ data:
     address: collectorset-controller:50000
     cluster_name: {{ required "A valid .Values.clusterName entry is required!" .Values.clusterName }}
     log_level: {{ .Values.logLevel }}
-    delete_devices: {{ required "A valid .Values.deleteDevices entry is required!" .Values.deleteDevices }}
+    delete_resources: {{ required "A valid .Values.deleteDevices entry is required!" .Values.deleteDevices }}
     disable_alerting: {{ required "A valid .Values.disableAlerting entry is required!" .Values.disableAlerting }}
     etcd_discovery_token: {{ .Values.etcdDiscoveryToken }}
     cluster_group_id: {{ .Values.clusterGroupID }}
     resource_group_id: {{ .Values.resourceGroupID }}
+    {{- if .Values.telemetryCronString}}
+    telemetry_cron_string: {{ .Values.telemetryCronString}}
+    {{- end }}
+    {{- if .Values.enableNewResourceTree }}
+    enable_new_resource_tree: {{ .Values.enableNewResourceTree }}
+    {{- end }}
+    {{- if .Values.telemetryCronString}}
+    telemetry_cron_string: {{ .Values.telemetryCronString}}
+    {{- end }}
+    {{- if .Values.registerGenericFilter}}
+    register_generic_filter: {{ .Values.registerGenericFilter}}
+    {{- end }}
+    {{- if .Values.enableNamespacesDeletedGroups}}
+    enable_namespaces_deleted_groups: {{ .Values.enableNamespacesDeletedGroups}}
+    {{- end }}
+    {{- if .Values.numberOfWorkers}}
+    number_of_workers: {{ .Values.numberOfWorkers}}
+    {{- end }}
     {{- if .Values.proxyURL }}
     proxy_url: {{ .Values.proxyURL }}
     {{- end }}
@@ -37,7 +55,7 @@ data:
       periodic_sync_min_interval: 10m
       periodic_delete_min_interval: 10m
       cache_sync_min_interval: 5m
-    device_group_props:
+    resource_group_props:
 {{ toYaml .Values.device_group_props | indent 6}}
 {{- if .Values.openmetrics }}
     openmetrics:
@@ -46,10 +64,6 @@ data:
     disable_resource_monitoring:
 {{- if .Values.disable_resource_monitoring}}
 {{ toYaml .Values.disable_resource_monitoring | indent 4}}
-{{- end }}
-  rl-policy.yaml: |
-{{- if .Values.rlpolicy }}
-{{ toYaml .Values.rlpolicy | indent 4}}
 {{- end }}
   filters-config.yaml: |
     filters:

argus/templates/deployment.yaml

@@ -102,8 +102,6 @@ spec:
               items:
                 - key: config.yaml
                   path: config.yaml
-                - key: rl-policy.yaml
-                  path: rl-policy.yaml
                 - key: filters-config.yaml
                   path: filters-config.yaml
 

argus/values.yaml

@@ -6,11 +6,11 @@ accessID: ""
 accessKey: ""
 # The LogicMonitor account name.
 account: ""
-# A unique name given to the cluster's device group.
+# A unique name given to the cluster's resource group.
 clusterName: ""
 # Set Argus Log Level
 logLevel: "info"
-# On a delete event, either delete from LogicMonitor or move the device to the `_delted` device group.
+# On a delete event, either delete from LogicMonitor or move the resource to the `_deleted` resource group.
 deleteDevices: true
 # Disables LogicMonitor alerting for all the cluster resources.
 disableAlerting: false
@@ -19,11 +19,11 @@ disableAlerting: false
 
 # Enable RBAC. If your cluster does not have RBAC enabled, this value should be set to false.
 enableRBAC: true
-# A parent group id of the cluster's device group.
+# A parent group id of the cluster's resource group.
 clusterGroupID: 0
 # A parent group id that will hold all cluster resources under it. This is useful when Argus is installed with non-admin user's token.
 resourceGroupID: 1
-# The public etcd discovery token used to add etcd hosts to the cluster device group.
+# The public etcd discovery token used to add etcd hosts to the cluster resource group.
 etcdDiscoveryToken: ""
 # The image respository of the [Argus](https://hub.docker.com/r/logicmonitor/argus) container.
 imageRepository: logicmonitor/argus
@@ -45,21 +45,34 @@ affinity: {}
 priorityClassName: ""
 # Tolerations are applied to pods, and allow the pods to schedule onto nodes with matching taints.
 tolerations: []
-# This parameter is used to specify if displayName should include namespace or not.
-fullDisplayNameIncludeNamespace: false
-# This parameter is used to specify if displayName should include both namespace and clusterName or not.
-fullDisplayNameIncludeClusterName: false
 # Labels to apply on all objects created by Argus
 labels: {}
 # Annotations to apply on all objects created by Argus
 annotations: {}
 # Set flag to ignore ssl/tls validation
 ignore_ssl: false
+
+# Flag to enable new resource tree to put all resources of a namespace in a single resource group
+enableNewResourceTree: false
+
+# Flag is used when #enableNewResourceTree is true - to create _deleted group in its individual namespace groups when scheduled delete is enabled
+enableNamespacesDeletedGroups: false
+
+# Flag to register generic filter based on resource label => "logicmonitor/monitoring": "disable"
+registerGenericFilter: false
+
+# To disable resource monitoring
+# for ex:
+# disableResourceMonitoring:
+#   - deployments
+#   - services
+disableResourceMonitoring: []
+
 # appIntervals defines time intervals for periodic sync, periodic delete and in memory cache resync operations.
 app_intervals:
   periodic_sync_interval: "30m"
-  periodic_delete_interval: "30m"
-  cache_sync_interval: "5m"
+  periodic_delete_interval: "10m"
+  cache_sync_interval: "1h"
 # Device group properties
 device_group_props:
   cluster:
@@ -81,15 +94,15 @@ device_group_props:
   hpas: []
 
 filters:
-  # The filtered expression for Pod device type. Based on this parameter, Pods would be added/deleted for discovery on LM.
+  # The filtered expression for Pod resource type. Based on this parameter, Pods would be added/deleted for discovery on LM.
   pod: []
-  # The filtered expression for Service device type. Based on this parameter, Services would be added/deleted for discovery on LM.
+  # The filtered expression for Service resource resource type. Based on this parameter, Services would be added/deleted for discovery on LM.
   service: []
-  # The filtered expression for Node device type. Based on this parameter, Nodes would be added/deleted for discovery on LM.
+  # The filtered expression for Node resource type. Based on this parameter, Nodes would be added/deleted for discovery on LM.
   node: []
-  # The filtered expression for Deployment device type. Based on this parameter, Deployments would be added/deleted for discovery on LM.
+  # The filtered expression for Deployment resource type. Based on this parameter, Deployments would be added/deleted for discovery on LM.
   deployment: []
-  # The filtered expression for HorizontalPodAutoscaler device type. Based on this parameter, HorizontalPodAutoscalers would be added/deleted for discovery on LM.
+  # The filtered expression for HorizontalPodAutoscaler resource type. Based on this parameter, HorizontalPodAutoscalers would be added/deleted for discovery on LM.
   hpa: []
 
 # openmetrics config for Argus metrics collection
@@ -143,39 +156,6 @@ collector:
         # The priority class name for Pod priority of the collector. If this parameter is set then user must have PriorityClass resource created otherwise Pod will be rejected.
         priorityClassName: ""
 
-# rlpolicy defines the rate at which argus will send requests to Logicmonitor portal in order to avoid rate limit thresholds
-rlpolicy:
-  device:
-    get:
-      pod: 60
-      dep: 10
-      svc: 10
-      node: 10
-      hpa: 10
-    post:
-      pod: 60
-      dep: 10
-      svc: 10
-      node: 10
-      hpa: 10
-    put:
-      pod: 60
-      dep: 10
-      svc: 10
-      node: 10
-      hpa: 10
-    patch:
-      pod: 60
-      dep: 10
-      svc: 10
-      node: 10
-      hpa: 10
-    delete:
-      pod: 60
-      dep: 10
-      svc: 10
-      node: 10
-      hpa: 10
 # List of resources to disable monitoring
 # for ex:
 # disable_resource_monitoring: