feat: added support for logdna agent tags (#15)

Author: vbontempi

.gitignore

@@ -54,3 +54,4 @@ Brewfile.lock.json
 
 # Visual Studio Code
 .vscode/
+*.code-workspace

README.md

@@ -124,6 +124,7 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_cluster_id"></a> [cluster\_id](#input\_cluster\_id) | Cluster id to add to agents to | `string` | n/a | yes |
 | <a name="input_cluster_resource_group_id"></a> [cluster\_resource\_group\_id](#input\_cluster\_resource\_group\_id) | Resource group of the cluster | `string` | n/a | yes |
+| <a name="input_logdna_agent_tags"></a> [logdna\_agent\_tags](#input\_logdna\_agent\_tags) | array of tags to group the host logs pushed by the logdna agent | `list(string)` | `[]` | no |
 | <a name="input_logdna_agent_version"></a> [logdna\_agent\_version](#input\_logdna\_agent\_version) | Version of the agent to deploy. To lookup version run: `ibmcloud cr images --restrict ext/logdna-agent`. If null, the default value is used. | `string` | `"3.8.0-20230206.cbc937fa5513f636"` | no |
 | <a name="input_logdna_enabled"></a> [logdna\_enabled](#input\_logdna\_enabled) | Deploy IBM Cloud Logging agent | `bool` | `true` | no |
 | <a name="input_logdna_ingestion_key"></a> [logdna\_ingestion\_key](#input\_logdna\_ingestion\_key) | Ingestion key for the IBM Cloud Logging agent to communicate with the instance | `string` | `null` | no |

chart/logdna-agent/templates/daemonset.yaml

@@ -53,6 +53,10 @@ spec:
             {{- end }}
             - name: LOGDNA_LOOKBACK
               value: smallfiles
+            {{- if .Values.agent.tags }}
+            - name: LOGDNA_TAGS
+              value: {{.Values.agent.tags}}
+            {{- end }}
             - name: LOGDNA_DB_PATH
               value: /var/lib/logdna
             - name: LOGDNA_REDACT_REGEX

chart/logdna-agent/values.yaml

@@ -17,3 +17,5 @@ tolerations:
   - key: "dedicated"
     value: "transit"
     effect: "NoExecute"
+agent:
+  tags: ""

examples/basic/main.tf

@@ -104,5 +104,5 @@ module "observability_agents" {
   logdna_ingestion_key      = module.observability_instances.logdna_ingestion_key
   sysdig_instance_name      = module.observability_instances.sysdig_name
   sysdig_access_key         = module.observability_instances.sysdig_access_key
-
+  logdna_agent_tags         = var.logdna_agent_tags
 }

examples/basic/variables.tf

@@ -27,3 +27,9 @@ variable "region" {
   description = "Region where resources are created"
   default     = "ca-tor"
 }
+
+variable "logdna_agent_tags" {
+  type        = list(string)
+  description = "Array of string of tags for logdna agent"
+  default     = []
+}

main.tf

@@ -100,6 +100,11 @@ resource "helm_release" "logdna_agent" {
     type  = "string"
     value = var.logdna_ingestion_key
   }
+  set {
+    name  = "agent.tags"
+    type  = "string"
+    value = join("\\,", var.logdna_agent_tags)
+  }
 
   provisioner "local-exec" {
     command     = "${path.module}/scripts/confirm-rollout-status.sh logdna-agent ${local.logdna_agent_namespace}"

module-metadata.json

@@ -35,6 +35,16 @@
       "cloud_data_type": "resource_group",
       "computed": true
     },
+    "logdna_agent_tags": {
+      "name": "logdna_agent_tags",
+      "type": "list(string)",
+      "description": "array of tags to group the host logs pushed by the logdna agent",
+      "default": [],
+      "pos": {
+        "filename": "variables.tf",
+        "line": 42
+      }
+    },
     "logdna_agent_version": {
       "name": "logdna_agent_version",
       "type": "string",
@@ -69,7 +79,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 43
+        "line": 48
       }
     },
     "logdna_instance_name": {
@@ -104,7 +114,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 76
+        "line": 81
       }
     },
     "sysdig_agent_version": {
@@ -114,7 +124,7 @@
       "default": "12.10.1",
       "pos": {
         "filename": "variables.tf",
-        "line": 68
+        "line": 73
       }
     },
     "sysdig_enabled": {
@@ -128,7 +138,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 50
+        "line": 55
       }
     },
     "sysdig_instance_name": {
@@ -141,7 +151,7 @@
       ],
       "pos": {
         "filename": "variables.tf",
-        "line": 56
+        "line": 61
       }
     },
     "sysdig_resource_group_id": {
@@ -150,7 +160,7 @@
       "description": "Resource group that the IBM Cloud Monitoring is in. Defaults to Clusters group",
       "pos": {
         "filename": "variables.tf",
-        "line": 62
+        "line": 67
       }
     }
   },
@@ -200,7 +210,7 @@
       },
       "pos": {
         "filename": "main.tf",
-        "line": 116
+        "line": 121
       }
     }
   },

tests/pr_test.go

@@ -48,8 +48,14 @@ func setupOptions(t *testing.T, prefix string, terraformDir string) *testhelper.
 func TestRunBasicAgents(t *testing.T) {
 	t.Parallel()
 
+	logDNATagsList := []string{"tag1", "tag2"}
+
 	options := setupOptions(t, "basic-obs-agents", terraformDirOther)
 
+	options.TerraformVars = map[string]interface{}{
+		"logdna_agent_tags": logDNATagsList,
+	}
+
 	output, err := options.RunTestConsistency()
 	assert.Nil(t, err, "This should not have errored")
 	assert.NotNil(t, output, "Expected some output")

variables.tf

@@ -39,6 +39,11 @@ variable "logdna_agent_version" {
   nullable = false
 }
 
+variable "logdna_agent_tags" {
+  type        = list(string)
+  description = "array of tags to group the host logs pushed by the logdna agent"
+  default     = []
+}
 
 variable "logdna_ingestion_key" {
   type        = string