Skip to content

Commit 1163233

Browse files
iamar7iamar7
authored
fix: removed Log Analysis references from docs and diagrams (#201)
1 parent d87efec commit 1163233

File tree

3 files changed

+9
-136
lines changed

3 files changed

+9
-136
lines changed

‎ibm_catalog.json‎

Lines changed: 7 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
"observability",
2020
"observability instances",
2121
"cloud logs",
22-
"log analysis",
2322
"cloud monitoring",
2423
"ATracker",
25-
"Activity Tracker",
2624
"observability agents"
2725
],
2826
"short_description": "Configures IBM Cloud Observability resources",
@@ -35,17 +33,13 @@
3533
"title": "Configures IBM Cloud Logs",
3634
"description": "Configures an IBM Cloud Logs instance."
3735
},
38-
{
39-
"title": "Configures IBM Log Analysis",
40-
"description": "Configures the IBM Log Analysis instance and logging agents."
41-
},
4236
{
4337
"title": "Configures IBM Cloud Monitoring",
4438
"description": "Configures the IBM Cloud Monitoring instance and logging agents."
4539
},
4640
{
4741
"title": "Configures IBM Cloud Activity Tracker Event Routing",
48-
"description": "Configures an IBM Cloud Activity Tracker route with a Cloud Object Storage, Log Analysis and Cloud Logs target."
42+
"description": "Configures an IBM Cloud Activity Tracker route with a Cloud Object Storage and Cloud Logs target."
4943
}
5044
],
5145
"support_details": "This product is in the community registry and support is handled in the source repo. You can open an issue at [https://github.com/terraform-ibm-modules/terraform-ibm-observability-da/issues](https://github.com/terraform-ibm-modules/terraform-ibm-observability-da/issues). Support is not offered through IBM Cloud Support.",
@@ -63,13 +57,6 @@
6357
"crn:v1:bluemix:public:iam::::role:Editor"
6458
]
6559
},
66-
{
67-
"role_crns": [
68-
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
69-
"crn:v1:bluemix:public:iam::::role:Editor"
70-
],
71-
"service_name": "logdna"
72-
},
7360
{
7461
"role_crns": [
7562
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
@@ -200,66 +187,6 @@
200187
{
201188
"key": "skip_logs_routing_auth_policy"
202189
},
203-
{
204-
"key": "log_analysis_provision"
205-
},
206-
{
207-
"key": "log_analysis_instance_name"
208-
},
209-
{
210-
"key": "log_analysis_plan",
211-
"options": [
212-
{
213-
"displayname": "lite",
214-
"value": "lite"
215-
},
216-
{
217-
"displayname": "7-day",
218-
"value": "7-day"
219-
},
220-
{
221-
"displayname": "14-day",
222-
"value": "14-day"
223-
},
224-
{
225-
"displayname": "30-day",
226-
"value": "30-day"
227-
},
228-
{
229-
"displayname": "hipaa-30-day",
230-
"value": "hipaa-30-day"
231-
}
232-
]
233-
},
234-
{
235-
"key": "log_analysis_service_endpoints",
236-
"options": [
237-
{
238-
"displayname": "public",
239-
"value": "public"
240-
},
241-
{
242-
"displayname": "private",
243-
"value": "private"
244-
},
245-
{
246-
"displayname": "public-and-private",
247-
"value": "public-and-private"
248-
}
249-
]
250-
},
251-
{
252-
"key": "log_analysis_tags"
253-
},
254-
{
255-
"key": "enable_log_archive"
256-
},
257-
{
258-
"key": "log_archive_api_key"
259-
},
260-
{
261-
"key": "enable_at_event_routing_to_log_analysis"
262-
},
263190
{
264191
"key": "enable_at_event_routing_to_cos_bucket"
265192
},
@@ -508,16 +435,12 @@
508435
}
509436
],
510437
"architecture": {
511-
"descriptions": "This architecture supports the deployment of IBM Log Analysis, IBM Cloud Monitoring and IBM Cloud Logs instances on IBM Cloud. It also supports the deployment of IBM Cloud Activity Tracker Event Routing to an Object Storage bucket, Log Analysis and Cloud Logs target.",
438+
"descriptions": "This architecture supports the deployment of IBM Cloud Monitoring and Cloud Logs instances on IBM Cloud. It also supports the deployment of IBM Cloud Activity Tracker Event Routing to an Object Storage bucket and Cloud Logs target.",
512439
"features": [
513440
{
514441
"title": "Creates a Cloud Logs instance",
515442
"description": "Creates and configures the IBM Cloud Logs instance."
516443
},
517-
{
518-
"title": "Creates a Log Analysis instance",
519-
"description": "Creates and configures the IBM Cloud Log Analysis instance."
520-
},
521444
{
522445
"description": "Creates a Monitoring instance",
523446
"title": "Creates and configures the IBM Cloud Monitoring instance."
@@ -527,8 +450,8 @@
527450
"description": "Creates and configures the IBM Cloud Object Storage buckets with archiving and expiration enabled."
528451
},
529452
{
530-
"title": "Creates an IBM Cloud Activity Tracker event route to an Object Storage bucket and Log Analysis target",
531-
"description": "Creates and configures the IBM Cloud Activity Tracker Event Routing to an IBM Cloud Object Storage bucket, IBM Cloud Log Analysis and IBM Cloud Logs target."
453+
"title": "Creates an IBM Cloud Activity Tracker event route to an Object Storage bucket and Cloud Logs target",
454+
"description": "Creates and configures the IBM Cloud Activity Tracker Event Routing to an IBM Cloud Object Storage bucket and IBM Cloud Logs target."
532455
}
533456
],
534457
"diagrams": [
@@ -538,7 +461,7 @@
538461
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-observability-da/main/reference-architecture/deployable-architecture-observability-instances.svg",
539462
"type": "image/svg+xml"
540463
},
541-
"description": "This architecture supports creating and configuring IBM Cloud Observability instances and IBM Cloud Activity Tracker Event Routing to an Object Storage bucket, Log Analysis and Cloud Logs instance."
464+
"description": "This architecture supports creating and configuring IBM Cloud Observability instances and IBM Cloud Activity Tracker Event Routing to an Object Storage bucket and Cloud Logs instance."
542465
}
543466
]
544467
}
@@ -622,52 +545,6 @@
622545
{
623546
"key": "wait_till_timeout"
624547
},
625-
{
626-
"key": "log_analysis_enabled"
627-
},
628-
{
629-
"key": "log_analysis_agent_tags"
630-
},
631-
{
632-
"key": "log_analysis_add_cluster_name"
633-
},
634-
{
635-
"key": "log_analysis_ingestion_key"
636-
},
637-
{
638-
"key": "log_analysis_secret_name"
639-
},
640-
{
641-
"key": "log_analysis_instance_region"
642-
},
643-
{
644-
"key": "log_analysis_endpoint_type",
645-
"options": [
646-
{
647-
"displayname": "private",
648-
"value": "private"
649-
},
650-
{
651-
"displayname": "public",
652-
"value": "public"
653-
}
654-
]
655-
},
656-
{
657-
"key": "log_analysis_agent_custom_line_inclusion"
658-
},
659-
{
660-
"key": "log_analysis_agent_custom_line_exclusion"
661-
},
662-
{
663-
"key": "log_analysis_agent_name"
664-
},
665-
{
666-
"key": "log_analysis_agent_namespace"
667-
},
668-
{
669-
"key": "log_analysis_agent_tolerations"
670-
},
671548
{
672549
"key": "cloud_monitoring_enabled"
673550
},
@@ -765,16 +642,12 @@
765642
}
766643
],
767644
"architecture": {
768-
"descriptions": "This architecture supports the deployment of IBM Log Analysis(DEPRECATED), IBM Cloud Monitoring and IBM Cloud Logs agent on an existing Red Hat OpenShift cluster.",
645+
"descriptions": "This architecture supports the deployment of IBM Cloud Monitoring and Cloud Logs agent on an existing Red Hat OpenShift cluster.",
769646
"features": [
770647
{
771-
"title": "Works with any openshit ir k8s cluster",
648+
"title": "Works with any openshift or k8s cluster",
772649
"description": "Works with the Red Hat OpenShift cluster."
773650
},
774-
{
775-
"title": "Deploys the IBM Log Analysis agent on an existing cluster.",
776-
"description": "Deploys the IBM Log Analysis agent on an existing Red Hat OpenShift cluster."
777-
},
778651
{
779652
"title": "Deploys the IBM Cloud Monitoring agent on an existing cluster.",
780653
"description": "Deploys the IBM Cloud Monitoring agent on an existing Red Hat OpenShift cluster."

0 commit comments

Comments
 (0)