AWS AWSCloudFormation documentation change
Summary
Reformatted YAML and JSON examples for scraper configuration with whitespace changes but no functional modifications
Security assessment
Changes are purely formatting/whitespace adjustments to improve readability. No security-related content was added or modified. Existing security configurations (like SecurityGroupIds) remain unchanged.
Diff
diff --git a/AWSCloudFormation/latest/TemplateReference/aws-resource-aps-scraper.md b/AWSCloudFormation/latest/TemplateReference/aws-resource-aps-scraper.md index 0e6287cc1..d8d0d87ba 100644 --- a//AWSCloudFormation/latest/TemplateReference/aws-resource-aps-scraper.md +++ b//AWSCloudFormation/latest/TemplateReference/aws-resource-aps-scraper.md @@ -175,23 +175,27 @@ The following example creates a scraper, showing how to pass in configuration. Y - AWSTemplateFormatVersion: 2010-09-09 - Resources: - Scraper: - Type: AWS::APS::Scraper - UpdateReplacePolicy: Retain - DeletionPolicy: Delete - Properties: - Alias: "Scraper-Test" - Source: - EksConfiguration: - ClusterArn: "arn:aws:eks:{region}:{account-id}:cluster/{cluster-name}" - SecurityGroupIds: - - "sg-{security-group-id}" - SubnetIds: - - "subnet-{subnet-id-1}" - - "subnet-{subnet-id-2}" - Destination: - AmpConfiguration: - WorkspaceArn: "arn:aws:aps:{region}:{account-id}:workspace/ws-{workspace-id}" - ScrapeConfiguration: - ConfigurationBlob: "global:\n scrape_interval: 30s\n # external_labels:\n # clusterArn: {cluster-arn}\nscrape_configs:\n # pod metrics\n - job_name: pod_exporter\n kubernetes_sd_configs:\n - role: pod\n # container metrics\n - job_name: cadvisor\n scheme: https\n authorization:\n credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token\n kubernetes_sd_configs:\n - role: node\n relabel_configs:\n - action: labelmap\n regex: __meta_kubernetes_node_label_(.+)\n - replacement: kubernetes.default.svc:443\n target_label: __address__\n - source_labels: [__meta_kubernetes_node_name]\n regex: (.+)\n target_label: __metrics_path__\n replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor\n # apiserver metrics\n - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token\n job_name: kubernetes-apiservers\n kubernetes_sd_configs:\n - role: endpoints\n relabel_configs:\n - action: keep\n regex: default;kubernetes;https\n source_labels:\n - __meta_kubernetes_namespace\n - __meta_kubernetes_service_name\n - __meta_kubernetes_endpoint_port_name\n scheme: https\n # kube proxy metrics\n - job_name: kube-proxy\n honor_labels: true\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - action: keep\n source_labels:\n - __meta_kubernetes_namespace\n - __meta_kubernetes_pod_name\n separator: '/'\n regex: 'kube-system/kube-proxy.+'\n - source_labels:\n - __address__\n action: replace\n target_label: __address__\n regex: (.+?)(\\:\\d+)?\n replacement: $1:10249" - Tags: - - Key: "BusinessPurpose" + AWSTemplateFormatVersion: 2010-09-09 Resources: Scraper: Type: + AWS::APS::Scraper UpdateReplacePolicy: Retain DeletionPolicy: Delete Properties: + Alias: "Scraper-Test" Source: EksConfiguration: ClusterArn: + "arn:aws:eks:{region}:{account-id}:cluster/{cluster-name}" SecurityGroupIds: - + "sg-{security-group-id}" SubnetIds: - "subnet-{subnet-id-1}" - + "subnet-{subnet-id-2}" Destination: AmpConfiguration: WorkspaceArn: + "arn:aws:aps:{region}:{account-id}:workspace/ws-{workspace-id}" ScrapeConfiguration: + ConfigurationBlob: "global:\n scrape_interval: 30s\n # external_labels:\n # + clusterArn: {cluster-arn}\nscrape_configs:\n # pod metrics\n - job_name: + pod_exporter\n kubernetes_sd_configs:\n - role: pod\n # container metrics\n - + job_name: cadvisor\n scheme: https\n authorization:\n credentials_file: + /var/run/secrets/kubernetes.io/serviceaccount/token\n kubernetes_sd_configs:\n - + role: node\n relabel_configs:\n - action: labelmap\n regex: + __meta_kubernetes_node_label_(.+)\n - replacement: kubernetes.default.svc:443\n + target_label: __address__\n - source_labels: [__meta_kubernetes_node_name]\n regex: + (.+)\n target_label: __metrics_path__\n replacement: + /api/v1/nodes/$1/proxy/metrics/cadvisor\n # apiserver metrics\n - bearer_token_file: + /var/run/secrets/kubernetes.io/serviceaccount/token\n job_name: + kubernetes-apiservers\n kubernetes_sd_configs:\n - role: endpoints\n + relabel_configs:\n - action: keep\n regex: default;kubernetes;https\n + source_labels:\n - __meta_kubernetes_namespace\n - __meta_kubernetes_service_name\n + - __meta_kubernetes_endpoint_port_name\n scheme: https\n # kube proxy metrics\n - + job_name: kube-proxy\n honor_labels: true\n kubernetes_sd_configs:\n - role: pod\n + relabel_configs:\n - action: keep\n source_labels:\n - __meta_kubernetes_namespace\n + - __meta_kubernetes_pod_name\n separator: '/'\n regex: 'kube-system/kube-proxy.+'\n + - source_labels:\n - __address__\n action: replace\n target_label: __address__\n + regex: (.+?)(\\:\\d+)?\n replacement: $1:10249" Tags: - Key: "BusinessPurpose" @@ -204,8 +207,21 @@ The following example creates a scraper, showing how to pass in configuration. Y - { - "CreateInputs": { - "Alias": "Scraper-Test", - "ScrapeConfiguration": { - "ConfigurationBlob": "global:\n scrape_interval: 30s\n # external_labels:\n # clusterArn: {cluster-arn}\nscrape_configs:\n # pod metrics\n - job_name: pod_exporter\n kubernetes_sd_configs:\n - role: pod\n # container metrics\n - job_name: cadvisor\n scheme: https\n authorization:\n credentials_file: /var/run/secrets/kubernetes.io/serviceaccount/token\n kubernetes_sd_configs:\n - role: node\n relabel_configs:\n - action: labelmap\n regex: __meta_kubernetes_node_label_(.+)\n - replacement: kubernetes.default.svc:443\n target_label: __address__\n - source_labels: [__meta_kubernetes_node_name]\n regex: (.+)\n target_label: __metrics_path__\n replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor\n # apiserver metrics\n - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token\n job_name: kubernetes-apiservers\n kubernetes_sd_configs:\n - role: endpoints\n relabel_configs:\n - action: keep\n regex: default;kubernetes;https\n source_labels:\n - __meta_kubernetes_namespace\n - __meta_kubernetes_service_name\n - __meta_kubernetes_endpoint_port_name\n scheme: https\n # kube proxy metrics\n - job_name: kube-proxy\n honor_labels: true\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - action: keep\n source_labels:\n - __meta_kubernetes_namespace\n - __meta_kubernetes_pod_name\n separator: '/'\n regex: 'kube-system/kube-proxy.+'\n - source_labels:\n - __address__\n action: replace\n target_label: __address__\n regex: (.+?)(\\:\\d+)?\n replacement: $1:10249" - }, - "Source": { - "EksConfiguration": { + { "CreateInputs": { "Alias": "Scraper-Test", + "ScrapeConfiguration": { "ConfigurationBlob": "global:\n scrape_interval: 30s\n # + external_labels:\n # clusterArn: {cluster-arn}\nscrape_configs:\n # pod metrics\n - + job_name: pod_exporter\n kubernetes_sd_configs:\n - role: pod\n # container + metrics\n - job_name: cadvisor\n scheme: https\n authorization:\n credentials_file: + /var/run/secrets/kubernetes.io/serviceaccount/token\n kubernetes_sd_configs:\n - + role: node\n relabel_configs:\n - action: labelmap\n regex: + __meta_kubernetes_node_label_(.+)\n - replacement: kubernetes.default.svc:443\n + target_label: __address__\n - source_labels: [__meta_kubernetes_node_name]\n regex: + (.+)\n target_label: __metrics_path__\n replacement: + /api/v1/nodes/$1/proxy/metrics/cadvisor\n # apiserver metrics\n - bearer_token_file: + /var/run/secrets/kubernetes.io/serviceaccount/token\n job_name: + kubernetes-apiservers\n kubernetes_sd_configs:\n - role: endpoints\n + relabel_configs:\n - action: keep\n regex: default;kubernetes;https\n + source_labels:\n - __meta_kubernetes_namespace\n - __meta_kubernetes_service_name\n + - __meta_kubernetes_endpoint_port_name\n scheme: https\n # kube proxy metrics\n - + job_name: kube-proxy\n honor_labels: true\n kubernetes_sd_configs:\n - role: pod\n + relabel_configs:\n - action: keep\n source_labels:\n - __meta_kubernetes_namespace\n + - __meta_kubernetes_pod_name\n separator: '/'\n regex: 'kube-system/kube-proxy.+'\n + - source_labels:\n - __address__\n action: replace\n target_label: __address__\n + regex: (.+?)(\\:\\d+)?\n replacement: $1:10249" }, "Source": { "EksConfiguration": { @@ -213,23 +229,5 @@ The following example creates a scraper, showing how to pass in configuration. Y - "SecurityGroupIds": [ - "sg-{security-group-id}" - ], - "SubnetIds": [ - "subnet-{subnet-id-1}", - "subnet-{subnet-id-2}" - ] - } - }, - "Destination": { - "AmpConfiguration": { - "WorkspaceArn": "arn:aws:aps:{region}:{account-id}:workspace/ws-{workspace-id}" - } - }, - "Tags": [ - { - "Key": "BusinessPurpose", - "Value": "Testing" - } - ] - }, - "PatchInputs": [] - } + "SecurityGroupIds": [ "sg-{security-group-id}" ], "SubnetIds": [ + "subnet-{subnet-id-1}", "subnet-{subnet-id-2}" ] } }, "Destination": { + "AmpConfiguration": { "WorkspaceArn": + "arn:aws:aps:{region}:{account-id}:workspace/ws-{workspace-id}" } }, "Tags": [ { + "Key": "BusinessPurpose", "Value": "Testing" } ] }, "PatchInputs": [] }