Merge pull request #135 from f5devcentral/development

clhain · web-flow · commit 8d62155ab436 · 2025-03-03T15:33:41.000-08:00
Publish AST v0.9.0
diff --git a/COLLECTOR_VERSION b/COLLECTOR_VERSION
@@ -1 +1 @@
-v0.8.1
+v0.9.0
diff --git a/README.md b/README.md
@@ -89,14 +89,34 @@ bigip_receiver_defaults:
   # BIGIP_PASSWORD_1
   password: "${env:BIGIP_PASSWORD_1}"
   # The data_types that should be enabled or disabled.
-  # DNS and GTM are disabled by default and users can enable those modules
+  # These are disabled by default and users can enable those modules
   # on all devices by setting the below to true.
   # A full list of data_types is at https://f5devcentral.github.io/application-study-tool/components/otel_collector/receiver_readme.html.
   data_types:
+    f5.apm:
+      enabled: false
+    f5.cgnat:
+      enabled: false
     f5.dns:
       enabled: false
+    f5.dos:
+      enabled: false
+    f5.firewall:
+      enabled: false
     f5.gtm:
       enabled: false
+    f5.policy.api_protection:
+      enabled: false
+    f5.policy.asm:
+      enabled: false
+    f5.policy.firewall:
+      enabled: false
+    f5.policy.ip_intelligence:
+      enabled: false
+    f5.policy.nat:
+      enabled: false
+    f5.profile.dos:
+      enabled: false
   # The TLS settings to use. Either a CA file must be specified or
   # insecure_skip_verify set to true (not recommended).
   tls:
@@ -341,7 +361,7 @@ special instructions / breaking changes.
 git stash
 git fetch --tags
 git pull origin main
-git checkout tags/RELEASE_VERSION #(e.g. tags/v0.8.1)
+git checkout tags/RELEASE_VERSION #(e.g. tags/v0.9.0)
 git stash pop
 # <merge any conflicts with your local changes>
 # <re-run config scripts>
diff --git a/config/ast_defaults.yaml b/config/ast_defaults.yaml
@@ -32,6 +32,18 @@ bigip_receiver_defaults:
       enabled: false
     f5.gtm:
       enabled: false
+    f5.policy.api_protection:
+      enabled: false
+    f5.policy.asm:
+      enabled: false
+    f5.policy.firewall:
+      enabled: false
+    f5.policy.ip_intelligence:
+      enabled: false
+    f5.policy.nat:
+      enabled: false
+    f5.profile.dos:
+      enabled: false
   # The TLS settings to use. Either a CA file must be specified or insecure_skip_verify
   # set to true (not recommended)
   tls:
diff --git a/config/bigip_receivers.yaml b/config/bigip_receivers.yaml
@@ -27,6 +27,18 @@ bigip/1:
     #   enabled: false
     # f5.gtm:
     #   enabled: false
+    # f5.policy.api_protection:
+    #   enabled: false
+    # f5.policy.asm:
+    #   enabled: false
+    # f5.policy.firewall:
+    #   enabled: false
+    # f5.policy.ip_intelligence:
+    #   enabled: false
+    # f5.policy.nat:
+    #   enabled: false
+    # f5.profile.dos:
+    #   enabled: false
   # tls:
   #   insecure_skip_verify: true
   #   ca_file:
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
       - 7lc_network
 
   otel-collector:
-    image: ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.8.1
+    image: ghcr.io/f5devcentral/application-study-tool/otel_custom_collector:v0.9.0
     restart: unless-stopped
     volumes:
       - ./services/otel_collector:/etc/otel-collector-config
diff --git a/pages/components/otel_collector/receiver_readme.md b/pages/components/otel_collector/receiver_readme.md
@@ -65,15 +65,10 @@ f5.network
 f5.node
 f5.plane
 f5.policy.eviction
-f5.policy.firewall
-f5.policy.ip_intelligence
-f5.policy.api_protection
 f5.policy.bandwidth_control
-f5.policy.nat
 f5.pool
 f5.profile.client_ssl
 f5.profile.server_ssl
-f5.profile.dos
 f5.profile.fasthttp
 f5.profile.fastl4
 f5.profile.http
@@ -88,7 +83,12 @@ f5.rule
 f5.ssl_certificate
 f5.system
 f5.virtual_server
-f5.policy.asm
+f5.policy.api_protection        ### DEFAULT DISABLE
+f5.policy.asm                   ### DEFAULT DISABLE
+f5.policy.firewall              ### DEFAULT DISABLE
+f5.policy.ip_intelligence       ### DEFAULT DISABLE
+f5.policy.nat                   ### DEFAULT DISABLE
+f5.profile.dos                  ### DEFAULT DISABLE
 f5.apm                          ### DEFAULT DISABLE
 f5.cgnat                        ### DEFAULT DISABLE
 f5.dns                          ### DEFAULT DISABLE
diff --git a/pages/config/config_helper/config_datafabric.md b/pages/config/config_helper/config_datafabric.md
@@ -2,7 +2,7 @@
 layout: page
 title: Configure Export To F5 Datafabric
 parent: Configuration Helper (Recommended)
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 3
 ---
 
diff --git a/pages/config/config_helper/config_defaults.md b/pages/config/config_helper/config_defaults.md
@@ -2,7 +2,7 @@
 layout: page
 title: Default Configuration
 parent: Configuration Helper (Recommended)
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 1
 ---
 
diff --git a/pages/config/config_helper/config_dns_gtm.md b/pages/config/config_helper/config_dns_gtm.md
@@ -2,7 +2,7 @@
 layout: page
 title: Configure DNS & GTM (Optional)
 parent: Configuration Helper (Recommended)
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 6
 ---
 
diff --git a/pages/config/config_helper/config_helper.md b/pages/config/config_helper/config_helper.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Configuration Helper (Recommended)
-parent: Configuration
+parent: Configuration Management
 nav_order: 3
 has_children: true
 permalink: /config/config_helper
diff --git a/pages/config/config_helper/config_receivers.md b/pages/config/config_helper/config_receivers.md
@@ -2,7 +2,7 @@
 layout: page
 title: Device Configuration
 parent: Configuration Helper (Recommended)
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 2
 ---
 
diff --git a/pages/config/config_helper/config_tls.md b/pages/config/config_helper/config_tls.md
@@ -2,7 +2,7 @@
 layout: page
 title: Configure TLS
 parent: Configuration Helper (Recommended)
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 5
 ---
 
diff --git a/pages/config/config_helper/metric_obfuscation.md b/pages/config/config_helper/metric_obfuscation.md
@@ -2,7 +2,7 @@
 layout: page
 title: Metric Obfuscation
 parent: Configuration Helper (Recommended)
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 4
 ---
 # Metric Obfuscation
diff --git a/pages/config/config_migration.md b/pages/config/config_migration.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Config Migration (pre v0.6.0)
-parent: Configuration
+parent: Configuration Management
 nav_order: 1
 ---
 # AST Config Migration for Pre v0.6.0 Deployments
diff --git a/pages/config/manual_config/default_otel.md b/pages/config/manual_config/default_otel.md
@@ -2,7 +2,7 @@
 layout: page
 title: Std Otel Collector Config
 parent: Manual Configuration
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 2
 ---
 
diff --git a/pages/config/manual_config/manual_config.md b/pages/config/manual_config/manual_config.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Manual Configuration
-parent: Configuration
+parent: Configuration Management
 nav_order: 3
 has_children: true
 permalink: /config/manual_config
diff --git a/pages/config/manual_config/receivers_pipelines.md b/pages/config/manual_config/receivers_pipelines.md
@@ -2,7 +2,7 @@
 layout: page
 title: Receiver/Pipeline Config
 parent: Manual Configuration
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 1
 ---
 
diff --git a/pages/config/secret_management/env_file_based.md b/pages/config/secret_management/env_file_based.md
@@ -2,7 +2,7 @@
 layout: page
 title: Via env File
 parent: Secrets Management
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 1
 ---
 
diff --git a/pages/config/secret_management/secret_management.md b/pages/config/secret_management/secret_management.md
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Secrets Management
-parent: Configuration
+parent: Configuration Management
 nav_order: 4
 ---
 
diff --git a/pages/config/secret_management/vault_based.md b/pages/config/secret_management/vault_based.md
@@ -2,7 +2,7 @@
 layout: page
 title: Via Vault Provider
 parent: Secrets Management
-grandparent: Configuration
+grandparent: Configuration Management
 nav_order: 2
 ---
 
diff --git a/services/grafana/provisioning/dashboards/bigip/fleet/fleet-apm-session.json b/services/grafana/provisioning/dashboards/bigip/fleet/fleet-apm-session.json
@@ -77,7 +77,7 @@
             "showLineNumbers": false,
             "showMiniMap": false
           },
-          "content": "APM Metrics are not enabled in the OpenTelemetry Collector by default\n(due to the relatively large number of requests required to gather the data).\n\n\nFor data to populate in this dashboard, you need to enable them as follows (and then you might want\nto delete this panel):\n\n## Enable For All BigIPs\nYou can enable CGNAT metrics for all BigIPs by editing the\nconfig/ast_defaults.yaml file in the AST directory and setting\n\n```yaml\nbigip_receiver_defaults:\n...\n  data_types:\n...\n    f5.apm:\n      enabled: true\n```\n\n## Enable For Select BigIPs\nYou can enable CGNAT metrics for specific BigIPs by editing the\nconfig/bigip_receivers.yaml file and setting the flag for the\nspecific devices you need:\n\n```yaml\nbigip/1:\n  endpoint: https://10.0.0.1\n  data_types:\n    f5.apm:\n      enabled: true\n```",
+          "content": "APM Metrics are not enabled in the OpenTelemetry Collector by default\n(due to the relatively large number of requests required to gather the data).\n\n\nFor data to populate in this dashboard, you need to enable them as follows (and then you might want\nto delete this panel):\n\n## Enable For All BigIPs\nYou can enable APM metrics for all BigIPs by editing the\nconfig/ast_defaults.yaml file in the AST directory and setting\n\n```yaml\nbigip_receiver_defaults:\n...\n  data_types:\n...\n    f5.apm:\n      enabled: true\n```\n\n## Enable For Select BigIPs\nYou can enable APM metrics for specific BigIPs by editing the\nconfig/bigip_receivers.yaml file and setting the flag for the\nspecific devices you need:\n\n```yaml\nbigip/1:\n  endpoint: https://10.0.0.1\n  data_types:\n    f5.apm:\n      enabled: true\n```",
           "mode": "markdown"
         },
         "pluginVersion": "11.2.0",
