Skip to content

Commit 0eed240

Browse files
feat: removed support to provision Log Analysis from the instances variation, and removed support to create an Atracker route to a Log Analysis. This service is deprecated and is replaced by IBM Cloud Logs. Support has also been removed to provision Log Analysis agents from the agents variation. (#187)
BREAKING CHANGE: Log Analysis instance and agent support has been fully removed
1 parent df75251 commit 0eed240

File tree

13 files changed

+53
-352
lines changed

13 files changed

+53
-352
lines changed

.secrets.baseline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2023-12-10T06:39:44Z",
6+
"generated_at": "2023-12-11T06:39:44Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"

solutions/agents/main.tf

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,7 @@ module "observability_agents" {
1616
cluster_resource_group_id = var.cluster_resource_group_id
1717
cluster_config_endpoint_type = var.cluster_config_endpoint_type
1818
# Log Analysis Agent
19-
log_analysis_enabled = var.log_analysis_enabled
20-
log_analysis_agent_name = var.prefix != null ? "${var.prefix}-${var.log_analysis_agent_name}" : var.log_analysis_agent_name
21-
log_analysis_agent_namespace = var.log_analysis_agent_namespace
22-
log_analysis_instance_region = var.log_analysis_instance_region
23-
log_analysis_ingestion_key = var.log_analysis_ingestion_key
24-
log_analysis_secret_name = var.prefix != null ? "${var.prefix}-${var.log_analysis_secret_name}" : var.log_analysis_secret_name
25-
log_analysis_agent_tolerations = var.log_analysis_agent_tolerations
26-
log_analysis_agent_tags = var.log_analysis_agent_tags
27-
log_analysis_endpoint_type = var.log_analysis_endpoint_type
28-
log_analysis_add_cluster_name = var.log_analysis_add_cluster_name
29-
# Log Analysis agent custom settings to setup Kubernetes metadata logs filtering by setting
30-
# LOGDNA_K8S_METADATA_LINE_INCLUSION and LOGDNA_K8S_METADATA_LINE_EXCLUSION in the agent daemonset definition
31-
# Ref https://github.com/logdna/logdna-agent-v2/blob/3.8/docs/KUBERNETES.md#configuration-for-kubernetes-metadata-filtering
32-
log_analysis_agent_custom_line_exclusion = var.log_analysis_agent_custom_line_inclusion
33-
log_analysis_agent_custom_line_inclusion = var.log_analysis_agent_custom_line_exclusion
19+
log_analysis_enabled = false
3420
# Cloud Monitoring (Sysdig) Agent
3521
cloud_monitoring_enabled = var.cloud_monitoring_enabled
3622
cloud_monitoring_agent_name = var.prefix != null ? "${var.prefix}-${var.cloud_monitoring_agent_name}" : var.cloud_monitoring_agent_name

solutions/agents/variables.tf

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -63,100 +63,6 @@ variable "wait_till_timeout" {
6363
default = 90
6464
}
6565

66-
##############################################################################
67-
# Log Analysis variables
68-
##############################################################################
69-
70-
variable "log_analysis_enabled" {
71-
type = bool
72-
description = "DEPRECATED: Whether to deploy the IBM Cloud logging agent."
73-
default = false
74-
}
75-
76-
77-
variable "log_analysis_agent_tags" {
78-
type = list(string)
79-
description = "DEPRECATED: The list of tags to associate with all log records collected by the agent so that you can quickly identify the agent’s data in the logging UI. To add the cluster name as a tag, use the `log_analysis_add_cluster_name` variable."
80-
default = []
81-
nullable = false
82-
}
83-
84-
variable "log_analysis_add_cluster_name" {
85-
type = bool
86-
description = "DEPRECATED: Whether to attach the cluster name to log messages. Set to `true` to configure the IBM Log Analysis agent to tag all log messages with the name."
87-
default = true
88-
}
89-
90-
variable "log_analysis_ingestion_key" {
91-
type = string
92-
description = "DEPRECATED: The ingestion key that is used by the IBM Cloud logging agent to communicate with the instance."
93-
sensitive = true
94-
default = null
95-
}
96-
97-
variable "log_analysis_secret_name" {
98-
type = string
99-
description = "DEPRECATED: The name of the secret that stores the ingestion key. If a prefix input variable is specified, the secret name is prefixed to the value in the `<prefix>-<name>` format."
100-
default = "logdna-agent"
101-
nullable = false
102-
}
103-
104-
variable "log_analysis_instance_region" {
105-
type = string
106-
description = "DEPRECATED: The name of the region where the IBM Log Analysis instance is created. The value is used in the ingestion endpoint in the format `api.<var-value>.logging.cloud.ibm.com`."
107-
default = null
108-
}
109-
110-
variable "log_analysis_endpoint_type" {
111-
type = string
112-
description = "DEPRECATED: Specify the IBM Log Analysis instance endpoint type to use to construct the ingestion endpoint. Possible values: `public` or `private`."
113-
default = "private"
114-
validation {
115-
error_message = "The specified `endpoint_type` can be `private` or `public` only."
116-
condition = contains(["private", "public"], var.log_analysis_endpoint_type)
117-
}
118-
}
119-
120-
variable "log_analysis_agent_custom_line_inclusion" {
121-
description = "DEPRECATED: The custom configuration of the IBM Log Analysis agent for the `LOGDNA_K8S_METADATA_LINE_INCLUSION` line inclusion setting. [Learn more](https://github.com/logdna/logdna-agent-v2/blob/master/docs/KUBERNETES.md#configuration-for-kubernetes-metadata-filtering)"
122-
type = string
123-
default = null # "namespace:default"
124-
}
125-
126-
variable "log_analysis_agent_custom_line_exclusion" {
127-
description = "DEPRECATED: The custom configuration of the IBM Log Analysis agent for the `LOGDNA_K8S_METADATA_LINE_INCLUSION` line exclusion setting. [Learn more](https://github.com/logdna/logdna-agent-v2/blob/master/docs/KUBERNETES.md#configuration-for-kubernetes-metadata-filtering)"
128-
type = string
129-
default = null # "label.app.kubernetes.io/name:sample-app\\, annotation.user:sample-user"
130-
}
131-
132-
variable "log_analysis_agent_name" {
133-
description = "DEPRECATED: The name of the IBM Log Analysis agent that is used to name the Kubernetes and Helm resources on the cluster. If a prefix input variable is passed, the name of the IBM Log Analysis agent is prefixed to the value in the `<prefix>-<name>` format."
134-
type = string
135-
default = "logdna-agent"
136-
nullable = false
137-
}
138-
139-
variable "log_analysis_agent_namespace" {
140-
type = string
141-
description = "DEPRECATED: The namespace to deploy the IBM Log Analysis agent in. The default value of the namespace is `ibm-observe`."
142-
default = "ibm-observe"
143-
nullable = false
144-
}
145-
146-
variable "log_analysis_agent_tolerations" {
147-
description = "DEPRECATED: The list of tolerations to apply to the IBM Log Analysis agent. Because the default value is the `Exists` operator, this variable will match any taint on any node. [Learn more](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)"
148-
type = list(object({
149-
key = optional(string)
150-
operator = optional(string)
151-
value = optional(string)
152-
effect = optional(string)
153-
tolerationSeconds = optional(number)
154-
}))
155-
default = [{
156-
operator = "Exists"
157-
}]
158-
}
159-
16066
##############################################################################
16167
# Cloud Monitoring variables
16268
##############################################################################

solutions/instances/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
This deployable architecture creates observability instances in IBM Cloud and supports provisioning the following resources:
44

55
* A resource group, if one is not passed in.
6-
* An IBM Cloud Log Analysis instance (Disabled by default as service is deprecated)
76
* An IBM Cloud Monitoring instance.
87
* An IBM Cloud Logs instance.
98
* An IBM Cloud Object Storage instance, if one does not exist.

0 commit comments

Comments
 (0)