diff --git a/README.md b/README.md index 6e1a0e1f9..8c502878c 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,9 @@ Replace the `curl -fsSL` command with `cp <> /tmp/logzio/` w sudo mkdir -p /opt/logzio-agent; sudo chown -R $USER: /opt/logzio-agent; mkdir -p /tmp/logzio; cp <> /tmp/logzio/; tar -zxf /tmp/logzio/agent_mac.tar.gz --directory /tmp/logzio; bash /tmp/logzio/agent.bash --url=https://app.logz.io --id=<> ``` +> [!NOTE] +> Testing changes for files outside of `/scripts` folder is currently not supported, as it requires generating a new release. + 4. **Test your changes:** Run the modified command locally to test your changes and ensure everything works as expected. \ No newline at end of file diff --git a/config-templates/helm.json b/config-templates/helm.json index c639c78c7..8d1914b0e 100644 --- a/config-templates/helm.json +++ b/config-templates/helm.json @@ -1,6 +1,21 @@ [ { - "template": "helm install -n monitoring --create-namespace --version 6.2.6 \\" + "template": "helm install -n monitoring --create-namespace \\" + }, + { + "template": " --set global.logzioRegion='<> \\", + "targetElement": "datasources[?(@.name=='Kubernetes')]", + "conditionalTemplates": [ + { + "template": " --set global.env_id='{{value}}' \\", + "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value", + "keepAsPlaceholder": true + } + ] + }, + { + "template": " --set global.logzioLogsToken='<>' \\", + "targetElement": "datasources[?(@.name=='Kubernetes' || @.name=='Security' || @.name=='DeployEvents')].telemetries[?(@.type=='LOG_ANALYTICS' || (@.type=='METRICS' && @.params[?(@.name=='isObjectLogs' && @.value==true)]))]" }, { "template": " --set logs.enabled=true \\", @@ -12,37 +27,19 @@ { "template": " --set logzio-fluentd.enabled=false \\" }, - { - "template": " --set logzio-logs-collector.secrets.logzioLogsToken='<>' \\" - }, - { - "template": " --set logzio-logs-collector.secrets.logzioRegion='<>' \\" - }, { "template": " --set logzio-logs-collector.fargateLogRouter.enabled=true \\", "condition": "$[?(@ == 'EKS')]", "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='isFargate')].value" - }, - { - "template": " --set logzio-logs-collector.secrets.env_id='{{value}}' \\", - "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value", - "keepAsPlaceholder": true } ] }, - { - "template": " --set metricsOrTraces.enabled=true \\", - "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS' || @.type=='TRACING')]" - }, { "template": " --set logzio-k8s-telemetry.metrics.enabled=true \\", "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]", "conditionalTemplates": [ { - "template": " --set logzio-k8s-telemetry.secrets.MetricsToken='<>' \\" - }, - { - "template": " --set logzio-k8s-telemetry.secrets.ListenerHost='https://<>:8053' \\" + "template": " --set global.logzioMetricsToken='<>' \\" }, { "condition": "$[?(@ == 'AKS')]", @@ -56,11 +53,6 @@ } ] }, - { - "template": " --set logzio-k8s-telemetry.secrets.p8s_logzio_name='{{value}}' \\", - "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value", - "keepAsPlaceholder": true - }, { "template": " --set logzio-k8s-telemetry.enableMetricsFilter.eks=true \\", "condition": "$[?(@ == 'EKS')]", @@ -84,40 +76,25 @@ { "template": " --set logzio-k8s-telemetry.k8sObjectsConfig.enabled=true \\", "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value" - }, - { - "template": " --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken='<>' \\", - "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value" - }, - { - "template": " --set logzio-k8s-telemetry.secrets.LogzioRegion='<>' \\" } ] }, { - "template": " --set logzio-k8s-telemetry.traces.enabled=true \\", + "template": " --set logzio-apm-collector.enabled=true \\", "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='TRACING')]", "conditionalTemplates": [ { - "template": " --set logzio-k8s-telemetry.secrets.TracesToken='<>' \\" + "template": " --set global.logzioTracesToken='<>' \\" }, { - "template": " --set logzio-k8s-telemetry.secrets.LogzioRegion='<>' \\" - }, - { - "template": " --set logzio-k8s-telemetry.spm.enabled=true \\", + "template": " --set logzio-apm-collector.spm.enabled=true \\", "targetElement": "capabilities[?(@ == 'SPM')]", "conditionalTemplates": [ { - "template": " --set logzio-k8s-telemetry.secrets.env_id='{{value}}' \\", - "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value", - "keepAsPlaceholder": true + "template": " --set global.logzioSpmToken='<>' \\" }, { - "template": " --set logzio-k8s-telemetry.secrets.SpmToken='<>' \\" - }, - { - "template": " --set logzio-k8s-telemetry.serviceGraph.enabled=true \\" + "template": " --set logzio-apm-collector.serviceGraph.enabled=true \\" } ] } @@ -125,39 +102,13 @@ }, { "template": " --set securityReport.enabled=true \\", - "targetElement": "datasources[?(@.name=='Security')]", - "conditionalTemplates": [ - { - "template": " --set logzio-trivy.env_id='{{value}}' \\", - "targetElement": "datasources[?(@.name=='Security')].params[?(@.name=='envID')].value", - "keepAsPlaceholder": true - }, - { - "template": " --set logzio-trivy.secrets.logzioShippingToken='<>' \\" - }, - { - "template": " --set logzio-trivy.secrets.logzioListener='<>' \\" - } - ] + "targetElement": "datasources[?(@.name=='Security')]" }, { "template": " --set deployEvents.enabled=true \\", - "targetElement": "datasources[?(@.name=='DeployEvents')]", - "conditionalTemplates": [ - { - "template": " --set logzio-k8s-events.secrets.env_id='{{value}}' \\", - "targetElement": "datasources[?(@.name=='DeployEvents')].params[?(@.name=='envID')].value", - "keepAsPlaceholder": true - }, - { - "template": " --set logzio-k8s-events.secrets.logzioShippingToken='<>' \\" - }, - { - "template": " --set logzio-k8s-events.secrets.logzioListener='<>' \\" - } - ] + "targetElement": "datasources[?(@.name=='DeployEvents')]" }, { "template": "logzio-monitoring logzio-helm/logzio-monitoring" } -] +] \ No newline at end of file diff --git a/datasources/linux/kubernetes/aks/deployevents/telemetry/logs/logs.bash b/datasources/linux/kubernetes/aks/deployevents/telemetry/logs/logs.bash index 983d6318f..64d1befc9 100755 --- a/datasources/linux/kubernetes/aks/deployevents/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/aks/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/linux/kubernetes/aks/kubernetes/installer/installer.bash b/datasources/linux/kubernetes/aks/kubernetes/installer/installer.bash index 72c0527ca..d8d046d3b 100755 --- a/datasources/linux/kubernetes/aks/kubernetes/installer/installer.bash +++ b/datasources/linux/kubernetes/aks/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE diff --git a/datasources/linux/kubernetes/aks/kubernetes/telemetry/logs/logs.bash b/datasources/linux/kubernetes/aks/kubernetes/telemetry/logs/logs.bash index 83d8ae4c1..246f1f887 100755 --- a/datasources/linux/kubernetes/aks/kubernetes/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/aks/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' # Get is scan security risks option was selected #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected" #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then diff --git a/datasources/linux/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash b/datasources/linux/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash index da660e106..0f1f2bfc6 100755 --- a/datasources/linux/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/linux/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if Kubernetes runs on Windows OS option was selected @@ -39,10 +37,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/linux/kubernetes/aks/kubernetes/telemetry/traces/traces.bash b/datasources/linux/kubernetes/aks/kubernetes/telemetry/traces/traces.bash index c4ad76615..3038be058 100755 --- a/datasources/linux/kubernetes/aks/kubernetes/telemetry/traces/traces.bash +++ b/datasources/linux/kubernetes/aks/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/linux/kubernetes/aks/security/telemetry/logs/logs.bash b/datasources/linux/kubernetes/aks/security/telemetry/logs/logs.bash index 8b9fd3fcc..3edc37296 100755 --- a/datasources/linux/kubernetes/aks/security/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/aks/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/linux/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash b/datasources/linux/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash index 983d6318f..64d1befc9 100755 --- a/datasources/linux/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/linux/kubernetes/digitalocean/kubernetes/installer/installer.bash b/datasources/linux/kubernetes/digitalocean/kubernetes/installer/installer.bash index 72c0527ca..d8d046d3b 100755 --- a/datasources/linux/kubernetes/digitalocean/kubernetes/installer/installer.bash +++ b/datasources/linux/kubernetes/digitalocean/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE diff --git a/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash b/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash index 83d8ae4c1..246f1f887 100755 --- a/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' # Get is scan security risks option was selected #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected" #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then diff --git a/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash b/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash index 2971756d8..a052ea138 100755 --- a/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if metrics filter option was selected @@ -33,10 +31,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash b/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash index c4ad76615..3038be058 100755 --- a/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash +++ b/datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/linux/kubernetes/digitalocean/security/telemetry/logs/logs.bash b/datasources/linux/kubernetes/digitalocean/security/telemetry/logs/logs.bash index 8b9fd3fcc..3edc37296 100755 --- a/datasources/linux/kubernetes/digitalocean/security/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/digitalocean/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/linux/kubernetes/eks/deployevents/telemetry/logs/logs.bash b/datasources/linux/kubernetes/eks/deployevents/telemetry/logs/logs.bash index 983d6318f..64d1befc9 100755 --- a/datasources/linux/kubernetes/eks/deployevents/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/eks/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/linux/kubernetes/eks/kubernetes/installer/installer.bash b/datasources/linux/kubernetes/eks/kubernetes/installer/installer.bash index 16dda703d..8f0471051 100755 --- a/datasources/linux/kubernetes/eks/kubernetes/installer/installer.bash +++ b/datasources/linux/kubernetes/eks/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi # Get is Fargate option was selected execute_task 'get_is_fargate_was_selected' 'Getting is Fargate option was selected' diff --git a/datasources/linux/kubernetes/eks/kubernetes/telemetry/logs/logs.bash b/datasources/linux/kubernetes/eks/kubernetes/telemetry/logs/logs.bash index 196e51259..acf3bc1e1 100755 --- a/datasources/linux/kubernetes/eks/kubernetes/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/eks/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' if $IS_FARGATE; then # Build enable Fargate Helm set execute_task 'build_enable_fargate_helm_set' 'Building enable Fargate Helm set' diff --git a/datasources/linux/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash b/datasources/linux/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash index dcb43a184..e19a9ec5c 100755 --- a/datasources/linux/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/linux/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if metrics filter option was selected @@ -37,10 +35,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/linux/kubernetes/eks/kubernetes/telemetry/traces/traces.bash b/datasources/linux/kubernetes/eks/kubernetes/telemetry/traces/traces.bash index c4ad76615..3038be058 100755 --- a/datasources/linux/kubernetes/eks/kubernetes/telemetry/traces/traces.bash +++ b/datasources/linux/kubernetes/eks/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/linux/kubernetes/eks/security/telemetry/logs/logs.bash b/datasources/linux/kubernetes/eks/security/telemetry/logs/logs.bash index 8b9fd3fcc..3edc37296 100755 --- a/datasources/linux/kubernetes/eks/security/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/eks/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/linux/kubernetes/gke/deployevents/telemetry/logs/logs.bash b/datasources/linux/kubernetes/gke/deployevents/telemetry/logs/logs.bash index 983d6318f..64d1befc9 100755 --- a/datasources/linux/kubernetes/gke/deployevents/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/gke/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/linux/kubernetes/gke/kubernetes/installer/installer.bash b/datasources/linux/kubernetes/gke/kubernetes/installer/installer.bash index 72c0527ca..d8d046d3b 100755 --- a/datasources/linux/kubernetes/gke/kubernetes/installer/installer.bash +++ b/datasources/linux/kubernetes/gke/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE diff --git a/datasources/linux/kubernetes/gke/kubernetes/telemetry/logs/logs.bash b/datasources/linux/kubernetes/gke/kubernetes/telemetry/logs/logs.bash index 83d8ae4c1..246f1f887 100755 --- a/datasources/linux/kubernetes/gke/kubernetes/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/gke/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' # Get is scan security risks option was selected #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected" #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then diff --git a/datasources/linux/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash b/datasources/linux/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash index 861cef5d1..5a82c0192 100755 --- a/datasources/linux/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/linux/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if metrics filter option was selected @@ -33,10 +31,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/linux/kubernetes/gke/kubernetes/telemetry/traces/traces.bash b/datasources/linux/kubernetes/gke/kubernetes/telemetry/traces/traces.bash index c4ad76615..3038be058 100755 --- a/datasources/linux/kubernetes/gke/kubernetes/telemetry/traces/traces.bash +++ b/datasources/linux/kubernetes/gke/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/linux/kubernetes/gke/security/telemetry/logs/logs.bash b/datasources/linux/kubernetes/gke/security/telemetry/logs/logs.bash index 8b9fd3fcc..3edc37296 100755 --- a/datasources/linux/kubernetes/gke/security/telemetry/logs/logs.bash +++ b/datasources/linux/kubernetes/gke/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/mac/kubernetes/aks/deployevents/telemetry/logs/logs.bash b/datasources/mac/kubernetes/aks/deployevents/telemetry/logs/logs.bash index 983d6318f..64d1befc9 100755 --- a/datasources/mac/kubernetes/aks/deployevents/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/aks/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/mac/kubernetes/aks/kubernetes/installer/installer.bash b/datasources/mac/kubernetes/aks/kubernetes/installer/installer.bash index 4a6e69f98..e0cb35bc1 100755 --- a/datasources/mac/kubernetes/aks/kubernetes/installer/installer.bash +++ b/datasources/mac/kubernetes/aks/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE diff --git a/datasources/mac/kubernetes/aks/kubernetes/telemetry/logs/logs.bash b/datasources/mac/kubernetes/aks/kubernetes/telemetry/logs/logs.bash index b8fc69ff5..d69d8b9fc 100755 --- a/datasources/mac/kubernetes/aks/kubernetes/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/aks/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' # Get is scan security risks option was selected #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected" #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then diff --git a/datasources/mac/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash b/datasources/mac/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash index 1da3fc186..9f4d97691 100755 --- a/datasources/mac/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/mac/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if Kubernetes runs on Windows OS option was selected @@ -39,10 +37,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/mac/kubernetes/aks/kubernetes/telemetry/traces/traces.bash b/datasources/mac/kubernetes/aks/kubernetes/telemetry/traces/traces.bash index dcd85ddcf..ccc562851 100755 --- a/datasources/mac/kubernetes/aks/kubernetes/telemetry/traces/traces.bash +++ b/datasources/mac/kubernetes/aks/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/mac/kubernetes/aks/security/telemetry/logs/logs.bash b/datasources/mac/kubernetes/aks/security/telemetry/logs/logs.bash index 0a6323fdd..9c36b8377 100755 --- a/datasources/mac/kubernetes/aks/security/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/aks/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/mac/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash b/datasources/mac/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash index 01ace77ff..5a99eaa6a 100755 --- a/datasources/mac/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/mac/kubernetes/digitalocean/kubernetes/installer/installer.bash b/datasources/mac/kubernetes/digitalocean/kubernetes/installer/installer.bash index 4a6e69f98..e0cb35bc1 100755 --- a/datasources/mac/kubernetes/digitalocean/kubernetes/installer/installer.bash +++ b/datasources/mac/kubernetes/digitalocean/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE diff --git a/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash b/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash index b8fc69ff5..d69d8b9fc 100755 --- a/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' # Get is scan security risks option was selected #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected" #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then diff --git a/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash b/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash index 288634a8f..7001f1bee 100755 --- a/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if metrics filter option was selected @@ -33,10 +31,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash b/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash index dcd85ddcf..ccc562851 100755 --- a/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash +++ b/datasources/mac/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/mac/kubernetes/digitalocean/security/telemetry/logs/logs.bash b/datasources/mac/kubernetes/digitalocean/security/telemetry/logs/logs.bash index 0a6323fdd..9c36b8377 100755 --- a/datasources/mac/kubernetes/digitalocean/security/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/digitalocean/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/mac/kubernetes/eks/deployevents/telemetry/logs/logs.bash b/datasources/mac/kubernetes/eks/deployevents/telemetry/logs/logs.bash index 01ace77ff..5a99eaa6a 100755 --- a/datasources/mac/kubernetes/eks/deployevents/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/eks/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/mac/kubernetes/eks/kubernetes/installer/installer.bash b/datasources/mac/kubernetes/eks/kubernetes/installer/installer.bash index 5eb0554e0..063be7f1c 100755 --- a/datasources/mac/kubernetes/eks/kubernetes/installer/installer.bash +++ b/datasources/mac/kubernetes/eks/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi # Get is Fargate option was selected execute_task 'get_is_fargate_was_selected' 'Getting is Fargate option was selected' diff --git a/datasources/mac/kubernetes/eks/kubernetes/telemetry/logs/logs.bash b/datasources/mac/kubernetes/eks/kubernetes/telemetry/logs/logs.bash index 55d25d418..cd6c219d1 100755 --- a/datasources/mac/kubernetes/eks/kubernetes/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/eks/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' if $IS_FARGATE; then # Build enable Fargate Helm set execute_task 'build_enable_fargate_helm_set' 'Building enable Fargate Helm set' diff --git a/datasources/mac/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash b/datasources/mac/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash index c67cac476..a5d6ad29e 100755 --- a/datasources/mac/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/mac/kubernetes/eks/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if metrics filter option was selected @@ -37,10 +35,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/mac/kubernetes/eks/kubernetes/telemetry/traces/traces.bash b/datasources/mac/kubernetes/eks/kubernetes/telemetry/traces/traces.bash index dcd85ddcf..ccc562851 100755 --- a/datasources/mac/kubernetes/eks/kubernetes/telemetry/traces/traces.bash +++ b/datasources/mac/kubernetes/eks/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/mac/kubernetes/eks/security/telemetry/logs/logs.bash b/datasources/mac/kubernetes/eks/security/telemetry/logs/logs.bash index 0a6323fdd..9c36b8377 100755 --- a/datasources/mac/kubernetes/eks/security/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/eks/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/mac/kubernetes/gke/deployevents/telemetry/logs/logs.bash b/datasources/mac/kubernetes/gke/deployevents/telemetry/logs/logs.bash index 01ace77ff..5a99eaa6a 100755 --- a/datasources/mac/kubernetes/gke/deployevents/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/gke/deployevents/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable deploy events Helm set execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set" -# Build Logz.io deploy events logs listener URL Helm set -execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set" # Build Logz.io deploy events logs token Helm set -execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" -# Build Deploy events environment id Helm set -execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set" diff --git a/datasources/mac/kubernetes/gke/kubernetes/installer/installer.bash b/datasources/mac/kubernetes/gke/kubernetes/installer/installer.bash index 4a6e69f98..e0cb35bc1 100755 --- a/datasources/mac/kubernetes/gke/kubernetes/installer/installer.bash +++ b/datasources/mac/kubernetes/gke/kubernetes/installer/installer.bash @@ -28,13 +28,11 @@ if $IS_TAINT; then fi # Get environment id execute_task 'get_environment_id' 'Getting environment id' -if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then - # Build enable metrics or traces Helm set - execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set' +if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then # Build environment tag Helm set - execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set' - # Build environment id Helm set - execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' + execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set' + # Build region Helm set + execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' fi DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE diff --git a/datasources/mac/kubernetes/gke/kubernetes/telemetry/logs/logs.bash b/datasources/mac/kubernetes/gke/kubernetes/telemetry/logs/logs.bash index c74235657..6d0bebe1b 100755 --- a/datasources/mac/kubernetes/gke/kubernetes/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/gke/kubernetes/telemetry/logs/logs.bash @@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set' execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set' # Build disable fluentd log collection Helm set execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set' -# Build Logz.io logs region Helm set -execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set' # Build Logz.io logs token Helm set execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set' -# Build environment id Helm set -execute_task 'build_environment_id_helm_set' 'Building environment id Helm set' # Get is scan security risks option was selected #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected" #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then diff --git a/datasources/mac/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash b/datasources/mac/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash index 5de1883cb..2719350c7 100755 --- a/datasources/mac/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash +++ b/datasources/mac/kubernetes/gke/kubernetes/telemetry/metrics/metrics.bash @@ -19,8 +19,6 @@ load_metrics_utils execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token' # Build enable metrics Helm set execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set' -# Build Logz.io metrics listener URL Helm set -execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set' # Build Logz.io metrics token Helm set execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set' # Get if metrics filter option was selected @@ -33,10 +31,10 @@ fi # Get if Kubernetes object logs option was selected execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected' if $IS_OBJECT_LOGS; then - # Build Logz.io region Helm set - execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' - # Build Logz.io Kubernetes object logs token Helm set - execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' # Build enable Kubernetes object logs Helm set execute_task 'build_enable_object_logs_helm_set' 'Building enable Kubernetes object logs Helm set' + # Build Logz.io Kubernetes object logs token Helm set + load_logs_utils + execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set' + execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set' fi diff --git a/datasources/mac/kubernetes/gke/kubernetes/telemetry/traces/traces.bash b/datasources/mac/kubernetes/gke/kubernetes/telemetry/traces/traces.bash index dcd85ddcf..ccc562851 100755 --- a/datasources/mac/kubernetes/gke/kubernetes/telemetry/traces/traces.bash +++ b/datasources/mac/kubernetes/gke/kubernetes/telemetry/traces/traces.bash @@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token' execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set' # Build Logz.io traces token Helm set execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set' -# Build Logz.io region Helm set -execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set' # Get Logz.io SPM token execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token' # Build enable SPM Helm set diff --git a/datasources/mac/kubernetes/gke/security/telemetry/logs/logs.bash b/datasources/mac/kubernetes/gke/security/telemetry/logs/logs.bash index 0a6323fdd..9c36b8377 100755 --- a/datasources/mac/kubernetes/gke/security/telemetry/logs/logs.bash +++ b/datasources/mac/kubernetes/gke/security/telemetry/logs/logs.bash @@ -19,9 +19,5 @@ load_logs_utils execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token' # Build enable security report Helm set execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set" -# Build Logz.io Trivy logs listener URL Helm set -execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set" # Build Logz.io Trivy logs token Helm set -execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" -# Build Trivy environment id Helm set -execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set" +execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set" diff --git a/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/functions.ps1 index 257cff67a..4016529ea 100755 --- a/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable deploy events Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableDeployEventsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io deploy events logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io deploy events logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io deploy events logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io deploy events logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Deploy events environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-DeployEventsEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building deploy events environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-k8s-events.secrets.env_id=$EnvId" - - $Message = "Deploy events Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/logs.ps1 index d21431094..ff63070d9 100755 --- a/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/aks/deployevents/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable deploy events Helm set Invoke-Task 'Build-EnableDeployEventsHelmSet' @{} 'Building enable deploy events Helm set' @($LogsFunctionsScript) -# Build Logz.io Deploy events logs listener url Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io deploy events logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Deploy events logs token Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) -# Build Deploy events environment id Helm set -Invoke-Task 'Build-DeployEventsEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Deploy events environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/aks/kubernetes/installer/functions.ps1 b/datasources/windows/kubernetes/aks/kubernetes/installer/functions.ps1 index 1b7eebbbb..b964cf430 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/installer/functions.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/installer/functions.ps1 @@ -430,29 +430,6 @@ function Build-TolerationsHelmSets { Write-TaskPostRun "`$script:HelmSets += '$TolerationsHelmSets'" } -# Builds enable metrics or traces Helm set -# Input: -# --- -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnableMetricsOrTracesHelmSet { - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building enable metrics or traces Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set metricsOrTraces.enabled=true" - - $Message = "Enable metrics or traces Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds metrics/traces environment tag Helm set # Input: # FuncArgs - Hashtable {EnvId = $script:EnvId} @@ -482,7 +459,7 @@ function Build-EnvironmentTagHelmSet { $local:EnvId = $FuncArgs.EnvId - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.p8s_logzio_name=$EnvId" + $local:HelmSet = " --set global.env_id=$EnvId" $Message = "Environment tag Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -492,47 +469,45 @@ function Build-EnvironmentTagHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds metrics/traces environment id helm set +# Builds Logz.io logs region Helm set # Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} +# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} # Output: # LogHelmSets - Containt all the Helm sets for logging # HelmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { +function Build-LogzioRegionHelmSet { param ( [hashtable]$FuncArgs ) - $local:ExitCode = 7 + $local:ExitCode = 2 $local:FuncName = $MyInvocation.MyCommand.Name - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $local:Message = 'Building Logz.io region Helm set ...' + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') + $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') if ($Err.Count -ne 0) { - $Message = "installer.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $Message = "logs.ps1 ($ExitCode): $($Err[0])" + Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-TaskPostRun "Write-Error `"$Message`"" return $ExitCode } - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message + $local:ListenerUrl = $FuncArgs.ListenerUrl - return - } + $local:Region = Get-LogzioRegion $ListenerUrl - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.env_id=$EnvId" + $Message = "Logz.io region is '$LogzioRegion'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-Log $script:LogLevelDebug $Message + # changed from fluentd + $local:HelmSet = " --set global.logzioRegion=$LogzioRegion" - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $local:Message = "Logz.io region Helm set is '$HelmSet'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" diff --git a/datasources/windows/kubernetes/aks/kubernetes/installer/installer.ps1 b/datasources/windows/kubernetes/aks/kubernetes/installer/installer.ps1 index e6cd82af5..bbbcab7c0 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/installer/installer.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/installer/installer.ps1 @@ -112,13 +112,11 @@ if ($script:IsTaint) { } # Get environment id Invoke-Task 'Get-EnvironmentID' @{GeneralParams = $script:GeneralParams; DefaultEnvId = $script:DefaultEnvId} 'Getting environment id' @($InstallerFunctionsScript) -if ($script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { - # Build enable metrics or traces Helm set - Invoke-Task 'Build-EnableMetricsOrTracesHelmSet' @{} 'Building enable metrics or traces Helm set' @($InstallerFunctionsScript) +if ($script:IsLogsOptionSelected -or $script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { # Build environment tag Helm set Invoke-Task 'Build-EnvironmentTagHelmSet' @{EnvId = $script:EnvId} 'Building environment tag Helm set' @($InstallerFunctionsScript) - # Build environment id Helm set - Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($InstallerFunctionsScript) + # Build Logz.io region Helm set + Invoke-Task 'Build-LogzioRegionHelmSet' @{GeneralParams = $script:GeneralParams} 'Building Logz.io region Helm set' @($InstallerFunctionsScript) } if ($script:IsLogsOptionSelected) { # Run logs script diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/functions.ps1 index 6081ce7a6..67212c43d 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/functions.ps1 @@ -2,6 +2,8 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# +$global:add_logs_token_once_flag = $false + # Gets Logz.io logs token # Input: # --- @@ -94,51 +96,6 @@ function Build-DisableFluentdHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io logs region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioLogsRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io logs region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - # changed from fluentd - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioRegion=$LogzioRegion" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io logs token Helm set # Input: # FuncArgs - Hashtable {LogsToken = $script:LogsToken} @@ -146,6 +103,12 @@ function Build-LogzioLogsRegionHelmSet { # LogHelmSets - Containt all the Helm sets for logging # helmSets - Contains all the Helm sets function Build-LogzioLogsTokenHelmSet { + # Add logs token only once + if ($global:add_logs_token_once_flag -eq $true) { + return + } + $global:add_logs_token_once_flag = $true + param ( [hashtable]$FuncArgs ) @@ -168,7 +131,7 @@ function Build-LogzioLogsTokenHelmSet { $local:LogsToken = $FuncArgs.LogsToken - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioLogsToken=$LogsToken" + $local:HelmSet = " --set global.logzioLogsToken=$LogsToken" $Message = "Logz.io logs token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -177,50 +140,3 @@ function Build-LogzioLogsTokenHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 4 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-logs-collector.env_id=$EnvId" - - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/logs.ps1 index b9797b4ed..bdd97c085 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/telemetry/logs/logs.ps1 @@ -20,12 +20,8 @@ Invoke-Task 'Build-EnableLogsHelmSet' @{} 'Building enable logs Helm set' @($Log Invoke-Task 'Build-EnableOtelLogCollectionHelmSet' @{} 'Building enable opentelemetry log collection Helm set' @($LogsFunctionsScript) # Build disable fluentd log collection Helm set Invoke-Task 'Build-DisableFluentdHelmSet' @{} 'Building disable fluentd log collection Helm set' @($LogsFunctionsScript) -# Build Logz.io logs region Helm set -Invoke-Task 'Build-LogzioLogsRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io logs region Helm set' @($LogsFunctionsScript) # Build Logz.io logs token Helm set Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io logs token Helm set' @($LogsFunctionsScript) -# Build environment id Helm set -Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/functions.ps1 index 44a2fe6f3..d3708b10c 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/functions.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/functions.ps1 @@ -56,46 +56,6 @@ function Build-EnableMetricsHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io metrics listener URL Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioMetricsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io metrics listener url Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - $ListenerUrl = "https://$ListenerUrl`:8053" - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.ListenerHost=$ListenerUrl" - - $local:Message = "Logz.io metrics listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io metrics token Helm set # Input: # FuncArgs - Hashtabla {MetricsToken = $script:MetricsToken} @@ -125,7 +85,7 @@ function Build-LogzioMetricsTokenHelmSet { $local:MetricsToken = $FuncArgs.MetricsToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.MetricsToken=$MetricsToken" + $local:HelmSet = " --set global.logzioMetricsToken=$MetricsToken" $local:Message = "Logz.io metrics token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -260,76 +220,6 @@ function Build-EnableMetricsFilterHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Gets Logz.io Kubernetes object logs token -# Input: -# --- -# Output: -# ObjectLogsToken - Logz.io Kubernetes object logs token -function Get-LogzioObjectLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io Kubernetes object logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io Kubernetes object logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:ObjectLogsToken = '$ShippingToken'" -} - -# Builds Logz.io Kubernetes object logs token Helm set -# Input: -# FuncArgs - Hashtabla {ObjectLogsToken = $script:ObjectLogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioObjectLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Kubernetes object logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ObjectLogsToken') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ObjectLogsToken = $FuncArgs.ObjectLogsToken - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken=$ObjectLogsToken" - - $local:Message = "Logz.io Kubernetes object logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets is Kubernetes object logs was selected # Input: # FuncArgs - Hashtable {MetricsParams = $script:MetricsParams} @@ -403,52 +293,3 @@ function Build-EnableObjectLogsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} \ No newline at end of file diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/metrics.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/metrics.ps1 index e017a02e4..60d899f59 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/metrics.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/metrics.ps1 @@ -44,8 +44,6 @@ Write-Host '###############' Invoke-Task 'Get-LogzioMetricsToken' @{} 'Getting Logz.io metrics token' @($MetricsFunctionsScript) # Build enable metrics Helm set Invoke-Task 'Build-EnableMetricsHelmSet' @{} 'Building enable metrics Helm set' @($MetricsFunctionsScript) -# Build Logz.io metrics listener URL Helm set -Invoke-Task 'Build-LogzioMetricsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io metrics listener URL Helm set' @($MetricsFunctionsScript) # Build Logz.io metrics token Helm set Invoke-Task 'Build-LogzioMetricsTokenHelmSet' @{MetricsToken = $script:MetricsToken} 'Building Logz.io metrics token Helm set' @($MetricsFunctionsScript) # Get if Kubernetes runs on Windows OS option was selected @@ -66,11 +64,9 @@ if ($script:IsObjectLogs) { # Build enable Kubernetes object logs Helm set Invoke-Task 'Build-EnableObjectLogsHelmSet' @{} 'Building enable Kubernetes object logs Helm set' @($MetricsFunctionsScript) # Get Logz.io Kubernetes object logs token - Invoke-Task 'Get-LogzioObjectLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) - # Build Logz.io Kubernetes object logs token Helm set - Invoke-Task 'Build-LogzioObjectLogsTokenHelmSet' @{ObjectLogsToken = $script:ObjectLogsToken} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) - # Build Logz.io region Helm set - Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($MetricsFunctionsScript) + . ..\logs\functions.ps1 + Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) + Invoke-Task 'Get-LogzioLogsTokenHelmSet' @{} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) } # Finished successfully diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/functions.ps1 index bb1e5b9d5..8769edf7b 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/functions.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/functions.ps1 @@ -46,7 +46,7 @@ function Build-EnableTracesHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.traces.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.enabled=true" $local:Message = "Enable traces Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -85,7 +85,7 @@ function Build-LogzioTracesTokenHelmSet { $local:TracesToken = $FuncArgs.TracesToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.TracesToken=$TracesToken" + $local:HelmSet = " --set global.logzioTracesToken=$TracesToken" $local:Message = "Logz.io traces token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -95,55 +95,6 @@ function Build-LogzioTracesTokenHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "traces.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets Logz.io SPM token # Input: # --- @@ -188,7 +139,7 @@ function Build-EnableSpmHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.spm.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.spm.enabled=true" $local:Message = "Enable SPM Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -227,7 +178,7 @@ function Build-LogzioSpmTokenHelmSet { $local:SpmToken = $FuncArgs.SpmToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.SpmToken=$SpmToken" + $local:HelmSet = " --set global.logzioSpmToken=$SpmToken" $local:Message = "Logz.io SPM token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/traces.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/traces.ps1 index 366108b3e..be897f222 100755 --- a/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/traces.ps1 +++ b/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/traces.ps1 @@ -18,8 +18,6 @@ Invoke-Task 'Get-LogzioTracesToken' @{} 'Getting Logz.io traces token' @($Traces Invoke-Task 'Build-EnableTracesHelmSet' @{} 'Building enable traces Helm set' @($TracesFunctionsScript) # Build Logz.io traces token Helm set Invoke-Task 'Build-LogzioTracesTokenHelmSet' @{TracesToken = $script:TracesToken} 'Building Logz.io traces token Helm set' @($TracesFunctionsScript) -# Build Logz.io region Helm set -Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($TracesFunctionsScript) # Get Logz.io SPM token Invoke-Task 'Get-LogzioSpmToken' @{} 'Getting Logz.io SPM token' @($TracesFunctionsScript) # Build enable SPM Helm set diff --git a/datasources/windows/kubernetes/aks/security/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/aks/security/telemetry/logs/functions.ps1 index 6b977fc8a..505981199 100755 --- a/datasources/windows/kubernetes/aks/security/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/aks/security/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable security report Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableSecurityReportHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io Trivy logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-trivy.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io Trivy logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io Trivy logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-trivy.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io Trivy logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Trivy environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-TrivyEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Trivy environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-trivy.env_id=$EnvId" - - $Message = "Trivy Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/aks/security/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/aks/security/telemetry/logs/logs.ps1 index 274d23f68..3138e0094 100755 --- a/datasources/windows/kubernetes/aks/security/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/aks/security/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable security report Helm set Invoke-Task 'Build-EnableSecurityReportHelmSet' @{} 'Building enable security report Helm set' @($LogsFunctionsScript) -# Build Logz.io Trivy logs listener url Helm set -Invoke-Task 'Build-LogzioTrivyLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io Trivy logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Trivy logs token Helm set -Invoke-Task 'Build-LogzioTrivyLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) -# Build Trivy environment id Helm set -Invoke-Task 'Build-TrivyEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Trivy environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/functions.ps1 index 257cff67a..4016529ea 100755 --- a/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable deploy events Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableDeployEventsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io deploy events logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io deploy events logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io deploy events logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io deploy events logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Deploy events environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-DeployEventsEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building deploy events environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-k8s-events.secrets.env_id=$EnvId" - - $Message = "Deploy events Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/logs.ps1 index d21431094..ff63070d9 100755 --- a/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/digitalocean/deployevents/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable deploy events Helm set Invoke-Task 'Build-EnableDeployEventsHelmSet' @{} 'Building enable deploy events Helm set' @($LogsFunctionsScript) -# Build Logz.io Deploy events logs listener url Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io deploy events logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Deploy events logs token Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) -# Build Deploy events environment id Helm set -Invoke-Task 'Build-DeployEventsEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Deploy events environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/installer/functions.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/installer/functions.ps1 index 34abe4318..5633c8f31 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/installer/functions.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/installer/functions.ps1 @@ -426,29 +426,6 @@ function Build-TolerationsHelmSets { Write-TaskPostRun "`$script:HelmSets += '$TolerationsHelmSets'" } -# Builds enable metrics or traces Helm set -# Input: -# --- -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnableMetricsOrTracesHelmSet { - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building enable metrics or traces Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set metricsOrTraces.enabled=true" - - $Message = "Enable metrics or traces Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds metrics/traces environment tag Helm set # Input: # FuncArgs - Hashtable {EnvId = $script:EnvId} @@ -478,7 +455,7 @@ function Build-EnvironmentTagHelmSet { $local:EnvId = $FuncArgs.EnvId - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.p8s_logzio_name=$EnvId" + $local:HelmSet = " --set global.env_id=$EnvId" $Message = "Environment tag Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -488,47 +465,45 @@ function Build-EnvironmentTagHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds metrics/traces environment id helm set +# Builds Logz.io logs region Helm set # Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} +# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} # Output: # LogHelmSets - Containt all the Helm sets for logging # HelmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { +function Build-LogzioRegionHelmSet { param ( [hashtable]$FuncArgs ) - $local:ExitCode = 7 + $local:ExitCode = 2 $local:FuncName = $MyInvocation.MyCommand.Name - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $local:Message = 'Building Logz.io region Helm set ...' + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') + $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') if ($Err.Count -ne 0) { - $Message = "installer.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $Message = "logs.ps1 ($ExitCode): $($Err[0])" + Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-TaskPostRun "Write-Error `"$Message`"" return $ExitCode } - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message + $local:ListenerUrl = $FuncArgs.ListenerUrl - return - } + $local:Region = Get-LogzioRegion $ListenerUrl - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.env_id=$EnvId" + $Message = "Logz.io region is '$LogzioRegion'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-Log $script:LogLevelDebug $Message + # changed from fluentd + $local:HelmSet = " --set global.logzioRegion=$LogzioRegion" - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $local:Message = "Logz.io region Helm set is '$HelmSet'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/installer/installer.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/installer/installer.ps1 index e6cd82af5..bbbcab7c0 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/installer/installer.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/installer/installer.ps1 @@ -112,13 +112,11 @@ if ($script:IsTaint) { } # Get environment id Invoke-Task 'Get-EnvironmentID' @{GeneralParams = $script:GeneralParams; DefaultEnvId = $script:DefaultEnvId} 'Getting environment id' @($InstallerFunctionsScript) -if ($script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { - # Build enable metrics or traces Helm set - Invoke-Task 'Build-EnableMetricsOrTracesHelmSet' @{} 'Building enable metrics or traces Helm set' @($InstallerFunctionsScript) +if ($script:IsLogsOptionSelected -or $script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { # Build environment tag Helm set Invoke-Task 'Build-EnvironmentTagHelmSet' @{EnvId = $script:EnvId} 'Building environment tag Helm set' @($InstallerFunctionsScript) - # Build environment id Helm set - Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($InstallerFunctionsScript) + # Build Logz.io region Helm set + Invoke-Task 'Build-LogzioRegionHelmSet' @{GeneralParams = $script:GeneralParams} 'Building Logz.io region Helm set' @($InstallerFunctionsScript) } if ($script:IsLogsOptionSelected) { # Run logs script diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/functions.ps1 index d44f0d67a..70a9b5e76 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/functions.ps1 @@ -2,6 +2,8 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# +$global:add_logs_token_once_flag = $false + # Gets Logz.io logs token # Input: # --- @@ -94,51 +96,6 @@ function Build-DisableFluentdHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io logs region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioLogsRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io logs region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - # changed from fluentd - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioRegion=$LogzioRegion" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io logs token Helm set # Input: # FuncArgs - Hashtable {LogsToken = $script:LogsToken} @@ -146,6 +103,12 @@ function Build-LogzioLogsRegionHelmSet { # LogHelmSets - Containt all the Helm sets for logging # helmSets - Contains all the Helm sets function Build-LogzioLogsTokenHelmSet { + # Add logs token only once + if ($global:add_logs_token_once_flag -eq $true) { + return + } + $global:add_logs_token_once_flag = $true + param ( [hashtable]$FuncArgs ) @@ -168,7 +131,7 @@ function Build-LogzioLogsTokenHelmSet { $local:LogsToken = $FuncArgs.LogsToken - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioLogsToken=$LogsToken" + $local:HelmSet = " --set global.logzioLogsToken=$LogsToken" $Message = "Logz.io logs token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -177,50 +140,3 @@ function Build-LogzioLogsTokenHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 4 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-logs-collector.secrets.env_id=$EnvId" - - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.ps1 index b9797b4ed..bdd97c085 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.ps1 @@ -20,12 +20,8 @@ Invoke-Task 'Build-EnableLogsHelmSet' @{} 'Building enable logs Helm set' @($Log Invoke-Task 'Build-EnableOtelLogCollectionHelmSet' @{} 'Building enable opentelemetry log collection Helm set' @($LogsFunctionsScript) # Build disable fluentd log collection Helm set Invoke-Task 'Build-DisableFluentdHelmSet' @{} 'Building disable fluentd log collection Helm set' @($LogsFunctionsScript) -# Build Logz.io logs region Helm set -Invoke-Task 'Build-LogzioLogsRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io logs region Helm set' @($LogsFunctionsScript) # Build Logz.io logs token Helm set Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io logs token Helm set' @($LogsFunctionsScript) -# Build environment id Helm set -Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/functions.ps1 index d26465932..056953e04 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/functions.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/functions.ps1 @@ -56,46 +56,6 @@ function Build-EnableMetricsHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io metrics listener URL Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioMetricsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io metrics listener url Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - $ListenerUrl = "https://$ListenerUrl`:8053" - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.ListenerHost=$ListenerUrl" - - $local:Message = "Logz.io metrics listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io metrics token Helm set # Input: # FuncArgs - Hashtabla {MetricsToken = $script:MetricsToken} @@ -125,7 +85,7 @@ function Build-LogzioMetricsTokenHelmSet { $local:MetricsToken = $FuncArgs.MetricsToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.MetricsToken=$MetricsToken" + $local:HelmSet = " --set global.logzioMetricsToken=$MetricsToken" $local:Message = "Logz.io metrics token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -209,76 +169,6 @@ function Build-EnableMetricsFilterHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Gets Logz.io Kubernetes object logs token -# Input: -# --- -# Output: -# ObjectLogsToken - Logz.io Kubernetes object logs token -function Get-LogzioObjectLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io Kubernetes object logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io Kubernetes object logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:ObjectLogsToken = '$ShippingToken'" -} - -# Builds Logz.io Kubernetes object logs token Helm set -# Input: -# FuncArgs - Hashtabla {ObjectLogsToken = $script:ObjectLogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioObjectLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Kubernetes object logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ObjectLogsToken') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ObjectLogsToken = $FuncArgs.ObjectLogsToken - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken=$ObjectLogsToken" - - $local:Message = "Logz.io Kubernetes object logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets is Kubernetes object logs was selected # Input: # FuncArgs - Hashtable {MetricsParams = $script:MetricsParams} @@ -352,51 +242,3 @@ function Build-EnableObjectLogsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} \ No newline at end of file diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.ps1 index 089dc9e31..055472629 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.ps1 @@ -16,8 +16,6 @@ Write-Host '###############' Invoke-Task 'Get-LogzioMetricsToken' @{} 'Getting Logz.io metrics token' @($MetricsFunctionsScript) # Build enable metrics Helm set Invoke-Task 'Build-EnableMetricsHelmSet' @{} 'Building enable metrics Helm set' @($MetricsFunctionsScript) -# Build Logz.io metrics listener URL Helm set -Invoke-Task 'Build-LogzioMetricsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io metrics listener URL Helm set' @($MetricsFunctionsScript) # Build Logz.io metrics token Helm set Invoke-Task 'Build-LogzioMetricsTokenHelmSet' @{MetricsToken = $script:MetricsToken} 'Building Logz.io metrics token Helm set' @($MetricsFunctionsScript) # Get if metrics filter option was selected @@ -32,11 +30,9 @@ if ($script:IsObjectLogs) { # Build enable Kubernetes object logs Helm set Invoke-Task 'Build-EnableObjectLogsHelmSet' @{} 'Building enable Kubernetes object logs Helm set' @($MetricsFunctionsScript) # Get Logz.io Kubernetes object logs token - Invoke-Task 'Get-LogzioObjectLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) - # Build Logz.io Kubernetes object logs token Helm set - Invoke-Task 'Build-LogzioObjectLogsTokenHelmSet' @{ObjectLogsToken = $script:ObjectLogsToken} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) - # Build Logz.io region Helm set - Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($MetricsFunctionsScript) + . ..\logs\functions.ps1 + Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) + Invoke-Task 'Get-LogzioLogsTokenHelmSet' @{} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) } # Finished successfully diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/functions.ps1 index 983148495..8769edf7b 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/functions.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/functions.ps1 @@ -46,7 +46,7 @@ function Build-EnableTracesHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.traces.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.enabled=true" $local:Message = "Enable traces Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -85,7 +85,7 @@ function Build-LogzioTracesTokenHelmSet { $local:TracesToken = $FuncArgs.TracesToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.TracesToken=$TracesToken" + $local:HelmSet = " --set global.logzioTracesToken=$TracesToken" $local:Message = "Logz.io traces token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -95,55 +95,6 @@ function Build-LogzioTracesTokenHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "traces.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets Logz.io SPM token # Input: # --- @@ -188,7 +139,7 @@ function Build-EnableSpmHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.spm.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.spm.enabled=true" $local:Message = "Enable SPM Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -227,7 +178,7 @@ function Build-LogzioSpmTokenHelmSet { $local:SpmToken = $FuncArgs.SpmToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.SpmToken=$SpmToken" + $local:HelmSet = " --set global.logzioSpmToken=$SpmToken" $local:Message = "Logz.io SPM token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.ps1 index 366108b3e..be897f222 100755 --- a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.ps1 +++ b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.ps1 @@ -18,8 +18,6 @@ Invoke-Task 'Get-LogzioTracesToken' @{} 'Getting Logz.io traces token' @($Traces Invoke-Task 'Build-EnableTracesHelmSet' @{} 'Building enable traces Helm set' @($TracesFunctionsScript) # Build Logz.io traces token Helm set Invoke-Task 'Build-LogzioTracesTokenHelmSet' @{TracesToken = $script:TracesToken} 'Building Logz.io traces token Helm set' @($TracesFunctionsScript) -# Build Logz.io region Helm set -Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($TracesFunctionsScript) # Get Logz.io SPM token Invoke-Task 'Get-LogzioSpmToken' @{} 'Getting Logz.io SPM token' @($TracesFunctionsScript) # Build enable SPM Helm set diff --git a/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/functions.ps1 index 6b977fc8a..505981199 100755 --- a/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable security report Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableSecurityReportHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io Trivy logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-trivy.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io Trivy logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io Trivy logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-trivy.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io Trivy logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Trivy environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-TrivyEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Trivy environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-trivy.env_id=$EnvId" - - $Message = "Trivy Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/logs.ps1 index 274d23f68..3138e0094 100755 --- a/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/digitalocean/security/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable security report Helm set Invoke-Task 'Build-EnableSecurityReportHelmSet' @{} 'Building enable security report Helm set' @($LogsFunctionsScript) -# Build Logz.io Trivy logs listener url Helm set -Invoke-Task 'Build-LogzioTrivyLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io Trivy logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Trivy logs token Helm set -Invoke-Task 'Build-LogzioTrivyLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) -# Build Trivy environment id Helm set -Invoke-Task 'Build-TrivyEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Trivy environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/functions.ps1 index 257cff67a..4016529ea 100755 --- a/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable deploy events Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableDeployEventsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io deploy events logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io deploy events logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io deploy events logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io deploy events logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Deploy events environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-DeployEventsEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building deploy events environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-k8s-events.secrets.env_id=$EnvId" - - $Message = "Deploy events Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/logs.ps1 index d21431094..ff63070d9 100755 --- a/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/eks/deployevents/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable deploy events Helm set Invoke-Task 'Build-EnableDeployEventsHelmSet' @{} 'Building enable deploy events Helm set' @($LogsFunctionsScript) -# Build Logz.io Deploy events logs listener url Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io deploy events logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Deploy events logs token Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) -# Build Deploy events environment id Helm set -Invoke-Task 'Build-DeployEventsEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Deploy events environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/eks/kubernetes/installer/functions.ps1 b/datasources/windows/kubernetes/eks/kubernetes/installer/functions.ps1 index 495b1e3fe..dc83f3557 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/installer/functions.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/installer/functions.ps1 @@ -428,29 +428,6 @@ function Build-TolerationsHelmSets { Write-TaskPostRun "`$script:HelmSets += '$TolerationsHelmSets'" } -# Builds enable metrics or traces Helm set -# Input: -# --- -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnableMetricsOrTracesHelmSet { - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building enable metrics or traces Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set metricsOrTraces.enabled=true" - - $Message = "Enable metrics or traces Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds metrics/traces environment tag Helm set # Input: # FuncArgs - Hashtable {EnvId = $script:EnvId} @@ -480,7 +457,7 @@ function Build-EnvironmentTagHelmSet { $local:EnvId = $FuncArgs.EnvId - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.p8s_logzio_name=$EnvId" + $local:HelmSet = " --set global.env_id=$EnvId" $Message = "Environment tag Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -490,53 +467,6 @@ function Build-EnvironmentTagHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds metrics/traces environment id helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "installer.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.env_id=$EnvId" - - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets is Fargate option was selected # Input: # FuncArgs - Hashtable {GeneralParams = $script:GeneralParams} @@ -676,3 +606,48 @@ function New-FargateProfile { return $ExitCode } } + +# Builds Logz.io logs region Helm set +# Input: +# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} +# Output: +# LogHelmSets - Containt all the Helm sets for logging +# HelmSets - Contains all the Helm sets +function Build-LogzioRegionHelmSet { + param ( + [hashtable]$FuncArgs + ) + + $local:ExitCode = 2 + $local:FuncName = $MyInvocation.MyCommand.Name + + $local:Message = 'Building Logz.io region Helm set ...' + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-Log $script:LogLevelDebug $Message + + $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') + if ($Err.Count -ne 0) { + $Message = "logs.ps1 ($ExitCode): $($Err[0])" + Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-TaskPostRun "Write-Error `"$Message`"" + + return $ExitCode + } + + $local:ListenerUrl = $FuncArgs.ListenerUrl + + $local:Region = Get-LogzioRegion $ListenerUrl + + $Message = "Logz.io region is '$LogzioRegion'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-Log $script:LogLevelDebug $Message + # changed from fluentd + $local:HelmSet = " --set global.logzioRegion=$LogzioRegion" + + $local:Message = "Logz.io region Helm set is '$HelmSet'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-Log $script:LogLevelDebug $Message + + Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" + Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" +} \ No newline at end of file diff --git a/datasources/windows/kubernetes/eks/kubernetes/installer/installer.ps1 b/datasources/windows/kubernetes/eks/kubernetes/installer/installer.ps1 index db32abe6f..7ff759b77 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/installer/installer.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/installer/installer.ps1 @@ -112,13 +112,11 @@ if ($script:IsTaint) { } # Get environment id Invoke-Task 'Get-EnvironmentID' @{GeneralParams = $script:GeneralParams; DefaultEnvId = $script:DefaultEnvId} 'Getting environment id' @($InstallerFunctionsScript) -if ($script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { - # Build enable metrics or traces Helm set - Invoke-Task 'Build-EnableMetricsOrTracesHelmSet' @{} 'Building enable metrics or traces Helm set' @($InstallerFunctionsScript) +if ($script:IsLogsOptionSelected -or $script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { # Build environment tag Helm set Invoke-Task 'Build-EnvironmentTagHelmSet' @{EnvId = $script:EnvId} 'Building environment tag Helm set' @($InstallerFunctionsScript) - # Build environment id Helm set - Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($InstallerFunctionsScript) + # Build Logz.io region Helm set + Invoke-Task 'Build-LogzioRegionHelmSet' @{GeneralParams = $script:GeneralParams} 'Building Logz.io region Helm set' @($InstallerFunctionsScript) } # Get is Fargate option was selected Invoke-Task 'Get-IsFargateWasSelected' @{GeneralParams = $script:GeneralParams} 'Getting is Fargate was selected' @($InstallerFunctionsScript) diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/functions.ps1 index ea29f71c0..94488c63e 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/functions.ps1 @@ -2,6 +2,8 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# +$global:add_logs_token_once_flag = $false + # Gets Logz.io logs token # Input: # --- @@ -94,51 +96,6 @@ function Build-DisableFluentdHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io logs region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioLogsRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io logs region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - # changed from fluentd - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioRegion=$LogzioRegion" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io logs token Helm set # Input: # FuncArgs - Hashtable {LogsToken = $script:LogsToken} @@ -146,6 +103,12 @@ function Build-LogzioLogsRegionHelmSet { # LogHelmSets - Containt all the Helm sets for logging # helmSets - Contains all the Helm sets function Build-LogzioLogsTokenHelmSet { + # Add logs token only once + if ($global:add_logs_token_once_flag -eq $true) { + return + } + $global:add_logs_token_once_flag = $true + param ( [hashtable]$FuncArgs ) @@ -168,7 +131,7 @@ function Build-LogzioLogsTokenHelmSet { $local:LogsToken = $FuncArgs.LogsToken - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioLogsToken=$LogsToken" + $local:HelmSet = " --set global.logzioLogsToken=$LogsToken" $Message = "Logz.io logs token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -178,53 +141,6 @@ function Build-LogzioLogsTokenHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 4 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-logs-collector.secrets.env_id=$EnvId" - - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds enable Fargate Helm set # Input: # --- diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/logs.ps1 index 6bd514421..d2a25071b 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/telemetry/logs/logs.ps1 @@ -20,12 +20,8 @@ Invoke-Task 'Build-EnableLogsHelmSet' @{} 'Building enable logs Helm set' @($Log Invoke-Task 'Build-EnableOtelLogCollectionHelmSet' @{} 'Building enable opentelemetry log collection Helm set' @($LogsFunctionsScript) # Build disable fluentd log collection Helm set Invoke-Task 'Build-DisableFluentdHelmSet' @{} 'Building disable fluentd log collection Helm set' @($LogsFunctionsScript) -# Build Logz.io logs region Helm set -Invoke-Task 'Build-LogzioLogsRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io logs region Helm set' @($LogsFunctionsScript) # Build Logz.io logs token Helm set Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io logs token Helm set' @($LogsFunctionsScript) -# Build environment id Helm set -Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($LogsFunctionsScript) if ($script:IsFargate) { # Build enable Fargate Helm set Invoke-Task 'Build-EnableFargateHelmSet' @{} 'Building enable Fargate Helm set' @($LogsFunctionsScript) diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/functions.ps1 index c6a0d99b5..f6572c18d 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/functions.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/functions.ps1 @@ -56,46 +56,6 @@ function Build-EnableMetricsHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io metrics listener URL Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioMetricsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io metrics listener url Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - $ListenerUrl = "https://$ListenerUrl`:8053" - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.ListenerHost=$ListenerUrl" - - $local:Message = "Logz.io metrics listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io metrics token Helm set # Input: # FuncArgs - Hashtabla {MetricsToken = $script:MetricsToken} @@ -125,7 +85,7 @@ function Build-LogzioMetricsTokenHelmSet { $local:MetricsToken = $FuncArgs.MetricsToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.MetricsToken=$MetricsToken" + $local:HelmSet = " --set global.logzioMetricsToken=$MetricsToken" $local:Message = "Logz.io metrics token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -232,76 +192,6 @@ function Build-FargateCollectorModeStandaloneHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Gets Logz.io Kubernetes object logs token -# Input: -# --- -# Output: -# ObjectLogsToken - Logz.io Kubernetes object logs token -function Get-LogzioObjectLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io Kubernetes object logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io Kubernetes object logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:ObjectLogsToken = '$ShippingToken'" -} - -# Builds Logz.io Kubernetes object logs token Helm set -# Input: -# FuncArgs - Hashtabla {ObjectLogsToken = $script:ObjectLogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioObjectLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Kubernetes object logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ObjectLogsToken') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ObjectLogsToken = $FuncArgs.ObjectLogsToken - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken=$ObjectLogsToken" - - $local:Message = "Logz.io Kubernetes object logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets is Kubernetes object logs was selected # Input: # FuncArgs - Hashtable {MetricsParams = $script:MetricsParams} @@ -375,52 +265,3 @@ function Build-EnableObjectLogsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} \ No newline at end of file diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/metrics.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/metrics.ps1 index fb35e22b7..78e80ba3b 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/metrics.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/metrics.ps1 @@ -16,8 +16,6 @@ Write-Host '###############' Invoke-Task 'Get-LogzioMetricsToken' @{} 'Getting Logz.io metrics token' @($MetricsFunctionsScript) # Build enable metrics Helm set Invoke-Task 'Build-EnableMetricsHelmSet' @{} 'Building enable metrics Helm set' @($MetricsFunctionsScript) -# Build Logz.io metrics listener URL Helm set -Invoke-Task 'Build-LogzioMetricsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io metrics listener URL Helm set' @($MetricsFunctionsScript) # Build Logz.io metrics token Helm set Invoke-Task 'Build-LogzioMetricsTokenHelmSet' @{MetricsToken = $script:MetricsToken} 'Building Logz.io metrics token Helm set' @($MetricsFunctionsScript) # Get if metrics filter option was selected @@ -36,11 +34,9 @@ if ($script:IsObjectLogs) { # Build enable Kubernetes object logs Helm set Invoke-Task 'Build-EnableObjectLogsHelmSet' @{} 'Building enable Kubernetes object logs Helm set' @($MetricsFunctionsScript) # Get Logz.io Kubernetes object logs token - Invoke-Task 'Get-LogzioObjectLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) - # Build Logz.io Kubernetes object logs token Helm set - Invoke-Task 'Build-LogzioObjectLogsTokenHelmSet' @{ObjectLogsToken = $script:ObjectLogsToken} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) - # Build Logz.io region Helm set - Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($MetricsFunctionsScript) + . ..\logs\functions.ps1 + Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) + Invoke-Task 'Get-LogzioLogsTokenHelmSet' @{} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) } # Finished successfully diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/functions.ps1 index 983148495..8769edf7b 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/functions.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/functions.ps1 @@ -46,7 +46,7 @@ function Build-EnableTracesHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.traces.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.enabled=true" $local:Message = "Enable traces Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -85,7 +85,7 @@ function Build-LogzioTracesTokenHelmSet { $local:TracesToken = $FuncArgs.TracesToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.TracesToken=$TracesToken" + $local:HelmSet = " --set global.logzioTracesToken=$TracesToken" $local:Message = "Logz.io traces token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -95,55 +95,6 @@ function Build-LogzioTracesTokenHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "traces.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets Logz.io SPM token # Input: # --- @@ -188,7 +139,7 @@ function Build-EnableSpmHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.spm.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.spm.enabled=true" $local:Message = "Enable SPM Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -227,7 +178,7 @@ function Build-LogzioSpmTokenHelmSet { $local:SpmToken = $FuncArgs.SpmToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.SpmToken=$SpmToken" + $local:HelmSet = " --set global.logzioSpmToken=$SpmToken" $local:Message = "Logz.io SPM token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/traces.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/traces.ps1 index 366108b3e..be897f222 100755 --- a/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/traces.ps1 +++ b/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/traces.ps1 @@ -18,8 +18,6 @@ Invoke-Task 'Get-LogzioTracesToken' @{} 'Getting Logz.io traces token' @($Traces Invoke-Task 'Build-EnableTracesHelmSet' @{} 'Building enable traces Helm set' @($TracesFunctionsScript) # Build Logz.io traces token Helm set Invoke-Task 'Build-LogzioTracesTokenHelmSet' @{TracesToken = $script:TracesToken} 'Building Logz.io traces token Helm set' @($TracesFunctionsScript) -# Build Logz.io region Helm set -Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($TracesFunctionsScript) # Get Logz.io SPM token Invoke-Task 'Get-LogzioSpmToken' @{} 'Getting Logz.io SPM token' @($TracesFunctionsScript) # Build enable SPM Helm set diff --git a/datasources/windows/kubernetes/eks/security/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/eks/security/telemetry/logs/functions.ps1 index 6b977fc8a..505981199 100755 --- a/datasources/windows/kubernetes/eks/security/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/eks/security/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable security report Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableSecurityReportHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io Trivy logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-trivy.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io Trivy logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io Trivy logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-trivy.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io Trivy logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Trivy environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-TrivyEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Trivy environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-trivy.env_id=$EnvId" - - $Message = "Trivy Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/eks/security/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/eks/security/telemetry/logs/logs.ps1 index 274d23f68..3138e0094 100755 --- a/datasources/windows/kubernetes/eks/security/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/eks/security/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable security report Helm set Invoke-Task 'Build-EnableSecurityReportHelmSet' @{} 'Building enable security report Helm set' @($LogsFunctionsScript) -# Build Logz.io Trivy logs listener url Helm set -Invoke-Task 'Build-LogzioTrivyLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io Trivy logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Trivy logs token Helm set -Invoke-Task 'Build-LogzioTrivyLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) -# Build Trivy environment id Helm set -Invoke-Task 'Build-TrivyEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Trivy environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/functions.ps1 index 257cff67a..4016529ea 100755 --- a/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable deploy events Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableDeployEventsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io deploy events logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io deploy events logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io deploy events logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioDeployEventsLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io deploy events logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-k8s-events.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io deploy events logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Deploy events environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-DeployEventsEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building deploy events environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-k8s-events.secrets.env_id=$EnvId" - - $Message = "Deploy events Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/logs.ps1 index d21431094..ff63070d9 100755 --- a/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/gke/deployevents/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable deploy events Helm set Invoke-Task 'Build-EnableDeployEventsHelmSet' @{} 'Building enable deploy events Helm set' @($LogsFunctionsScript) -# Build Logz.io Deploy events logs listener url Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io deploy events logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Deploy events logs token Helm set -Invoke-Task 'Build-LogzioDeployEventsLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) -# Build Deploy events environment id Helm set -Invoke-Task 'Build-DeployEventsEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Deploy events environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io deploy events logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/gke/kubernetes/installer/functions.ps1 b/datasources/windows/kubernetes/gke/kubernetes/installer/functions.ps1 index b3ff5f02f..c5504feaa 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/installer/functions.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/installer/functions.ps1 @@ -428,29 +428,6 @@ function Build-TolerationsHelmSets { Write-TaskPostRun "`$script:HelmSets += '$TolerationsHelmSets'" } -# Builds enable metrics or traces Helm set -# Input: -# --- -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnableMetricsOrTracesHelmSet { - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building enable metrics or traces Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set metricsOrTraces.enabled=true" - - $Message = "Enable metrics or traces Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds metrics/traces environment tag Helm set # Input: # FuncArgs - Hashtable {EnvId = $script:EnvId} @@ -480,7 +457,7 @@ function Build-EnvironmentTagHelmSet { $local:EnvId = $FuncArgs.EnvId - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.p8s_logzio_name=$EnvId" + $local:HelmSet = " --set global.env_id=$EnvId" $Message = "Environment tag Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -490,47 +467,45 @@ function Build-EnvironmentTagHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds metrics/traces environment id helm set +# Builds Logz.io logs region Helm set # Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} +# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} # Output: # LogHelmSets - Containt all the Helm sets for logging # HelmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { +function Build-LogzioRegionHelmSet { param ( [hashtable]$FuncArgs ) - $local:ExitCode = 7 + $local:ExitCode = 2 $local:FuncName = $MyInvocation.MyCommand.Name - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $local:Message = 'Building Logz.io region Helm set ...' + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') + $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') if ($Err.Count -ne 0) { - $Message = "installer.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $Message = "logs.ps1 ($ExitCode): $($Err[0])" + Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-TaskPostRun "Write-Error `"$Message`"" return $ExitCode } - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message + $local:ListenerUrl = $FuncArgs.ListenerUrl - return - } + $local:Region = Get-LogzioRegion $ListenerUrl - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.env_id=$EnvId" + $Message = "Logz.io region is '$LogzioRegion'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + Write-Log $script:LogLevelDebug $Message + # changed from fluentd + $local:HelmSet = " --set global.logzioRegion=$LogzioRegion" - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepInstallation $script:LogScriptInstaller $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource + $local:Message = "Logz.io region Helm set is '$HelmSet'" + Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" diff --git a/datasources/windows/kubernetes/gke/kubernetes/installer/installer.ps1 b/datasources/windows/kubernetes/gke/kubernetes/installer/installer.ps1 index e6cd82af5..bbbcab7c0 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/installer/installer.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/installer/installer.ps1 @@ -112,13 +112,11 @@ if ($script:IsTaint) { } # Get environment id Invoke-Task 'Get-EnvironmentID' @{GeneralParams = $script:GeneralParams; DefaultEnvId = $script:DefaultEnvId} 'Getting environment id' @($InstallerFunctionsScript) -if ($script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { - # Build enable metrics or traces Helm set - Invoke-Task 'Build-EnableMetricsOrTracesHelmSet' @{} 'Building enable metrics or traces Helm set' @($InstallerFunctionsScript) +if ($script:IsLogsOptionSelected -or $script:IsMetricsOptionSelected -or $script:IsTracesOptionSelected) { # Build environment tag Helm set Invoke-Task 'Build-EnvironmentTagHelmSet' @{EnvId = $script:EnvId} 'Building environment tag Helm set' @($InstallerFunctionsScript) - # Build environment id Helm set - Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($InstallerFunctionsScript) + # Build Logz.io region Helm set + Invoke-Task 'Build-LogzioRegionHelmSet' @{GeneralParams = $script:GeneralParams} 'Building Logz.io region Helm set' @($InstallerFunctionsScript) } if ($script:IsLogsOptionSelected) { # Run logs script diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/functions.ps1 index d44f0d67a..70a9b5e76 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/functions.ps1 @@ -2,6 +2,8 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# +$global:add_logs_token_once_flag = $false + # Gets Logz.io logs token # Input: # --- @@ -94,51 +96,6 @@ function Build-DisableFluentdHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io logs region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioLogsRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io logs region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - # changed from fluentd - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioRegion=$LogzioRegion" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io logs token Helm set # Input: # FuncArgs - Hashtable {LogsToken = $script:LogsToken} @@ -146,6 +103,12 @@ function Build-LogzioLogsRegionHelmSet { # LogHelmSets - Containt all the Helm sets for logging # helmSets - Contains all the Helm sets function Build-LogzioLogsTokenHelmSet { + # Add logs token only once + if ($global:add_logs_token_once_flag -eq $true) { + return + } + $global:add_logs_token_once_flag = $true + param ( [hashtable]$FuncArgs ) @@ -168,7 +131,7 @@ function Build-LogzioLogsTokenHelmSet { $local:LogsToken = $FuncArgs.LogsToken - $local:HelmSet = " --set logzio-logs-collector.secrets.logzioLogsToken=$LogsToken" + $local:HelmSet = " --set global.logzioLogsToken=$LogsToken" $Message = "Logz.io logs token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -177,50 +140,3 @@ function Build-LogzioLogsTokenHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-EnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 4 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-logs-collector.secrets.env_id=$EnvId" - - $Message = "Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/logs.ps1 index b9797b4ed..bdd97c085 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/telemetry/logs/logs.ps1 @@ -20,12 +20,8 @@ Invoke-Task 'Build-EnableLogsHelmSet' @{} 'Building enable logs Helm set' @($Log Invoke-Task 'Build-EnableOtelLogCollectionHelmSet' @{} 'Building enable opentelemetry log collection Helm set' @($LogsFunctionsScript) # Build disable fluentd log collection Helm set Invoke-Task 'Build-DisableFluentdHelmSet' @{} 'Building disable fluentd log collection Helm set' @($LogsFunctionsScript) -# Build Logz.io logs region Helm set -Invoke-Task 'Build-LogzioLogsRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io logs region Helm set' @($LogsFunctionsScript) # Build Logz.io logs token Helm set Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io logs token Helm set' @($LogsFunctionsScript) -# Build environment id Helm set -Invoke-Task 'Build-EnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building environment id Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/functions.ps1 index d26465932..056953e04 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/functions.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/functions.ps1 @@ -56,46 +56,6 @@ function Build-EnableMetricsHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io metrics listener URL Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioMetricsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 2 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io metrics listener url Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - $ListenerUrl = "https://$ListenerUrl`:8053" - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.ListenerHost=$ListenerUrl" - - $local:Message = "Logz.io metrics listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Builds Logz.io metrics token Helm set # Input: # FuncArgs - Hashtabla {MetricsToken = $script:MetricsToken} @@ -125,7 +85,7 @@ function Build-LogzioMetricsTokenHelmSet { $local:MetricsToken = $FuncArgs.MetricsToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.MetricsToken=$MetricsToken" + $local:HelmSet = " --set global.logzioMetricsToken=$MetricsToken" $local:Message = "Logz.io metrics token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -209,76 +169,6 @@ function Build-EnableMetricsFilterHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Gets Logz.io Kubernetes object logs token -# Input: -# --- -# Output: -# ObjectLogsToken - Logz.io Kubernetes object logs token -function Get-LogzioObjectLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io Kubernetes object logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io Kubernetes object logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:ObjectLogsToken = '$ShippingToken'" -} - -# Builds Logz.io Kubernetes object logs token Helm set -# Input: -# FuncArgs - Hashtabla {ObjectLogsToken = $script:ObjectLogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioObjectLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Kubernetes object logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ObjectLogsToken') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ObjectLogsToken = $FuncArgs.ObjectLogsToken - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken=$ObjectLogsToken" - - $local:Message = "Logz.io Kubernetes object logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets is Kubernetes object logs was selected # Input: # FuncArgs - Hashtable {MetricsParams = $script:MetricsParams} @@ -352,51 +242,3 @@ function Build-EnableObjectLogsHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "metrics.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} \ No newline at end of file diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/metrics.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/metrics.ps1 index 60efb096c..e29254725 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/metrics.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/metrics.ps1 @@ -16,8 +16,6 @@ Write-Host '###############' Invoke-Task 'Get-LogzioMetricsToken' @{} 'Getting Logz.io metrics token' @($MetricsFunctionsScript) # Build enable metrics Helm set Invoke-Task 'Build-EnableMetricsHelmSet' @{} 'Building enable metrics Helm set' @($MetricsFunctionsScript) -# Build Logz.io metrics listener URL Helm set -Invoke-Task 'Build-LogzioMetricsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io metrics listener URL Helm set' @($MetricsFunctionsScript) # Build Logz.io metrics token Helm set Invoke-Task 'Build-LogzioMetricsTokenHelmSet' @{MetricsToken = $script:MetricsToken} 'Building Logz.io metrics token Helm set' @($MetricsFunctionsScript) # Get if metrics filter option was selected @@ -32,11 +30,9 @@ if ($script:IsObjectLogs) { # Build enable Kubernetes object logs Helm set Invoke-Task 'Build-EnableObjectLogsHelmSet' @{} 'Building enable Kubernetes object logs Helm set' @($MetricsFunctionsScript) # Get Logz.io Kubernetes object logs token - Invoke-Task 'Get-LogzioObjectLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) - # Build Logz.io Kubernetes object token logs Helm set - Invoke-Task 'Build-LogzioObjectLogsTokenHelmSet' @{ObjectLogsToken = $script:ObjectLogsToken} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) - # Build Logz.io region Helm set - Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($MetricsFunctionsScript) + . ..\logs\functions.ps1 + Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io Kubernetes object logs token' @($MetricsFunctionsScript) + Invoke-Task 'Get-LogzioLogsTokenHelmSet' @{} 'Building Logz.io Kubernetes object logs token Helm set' @($MetricsFunctionsScript) } # Finished successfully Exit 0 diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/functions.ps1 index 983148495..8769edf7b 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/functions.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/functions.ps1 @@ -46,7 +46,7 @@ function Build-EnableTracesHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.traces.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.enabled=true" $local:Message = "Enable traces Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -85,7 +85,7 @@ function Build-LogzioTracesTokenHelmSet { $local:TracesToken = $FuncArgs.TracesToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.TracesToken=$TracesToken" + $local:HelmSet = " --set global.logzioTracesToken=$TracesToken" $local:Message = "Logz.io traces token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -95,55 +95,6 @@ function Build-LogzioTracesTokenHelmSet { Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } -# Builds Logz.io region Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# HelmSets - Contains all the Helm sets -function Build-LogzioRegionHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 3 - $local:FuncName = $MyInvocation.MyCommand.Name - - # Check if LogzioRegion already exists in HelmSets - if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") { - return - } - - $local:Message = 'Building Logz.io region Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "traces.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:Region = Get-LogzioRegion $ListenerUrl - - $Message = "Logz.io region is '$LogzioRegion'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.LogzioRegion=$Region" - - $local:Message = "Logz.io region Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - # Gets Logz.io SPM token # Input: # --- @@ -188,7 +139,7 @@ function Build-EnableSpmHelmSet { Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource Write-Log $script:LogLevelDebug $Message - $local:HelmSet = " --set logzio-k8s-telemetry.spm.enabled=true" + $local:HelmSet = " --set logzio-apm-collector.spm.enabled=true" $local:Message = "Enable SPM Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource @@ -227,7 +178,7 @@ function Build-LogzioSpmTokenHelmSet { $local:SpmToken = $FuncArgs.SpmToken - $local:HelmSet = " --set logzio-k8s-telemetry.secrets.SpmToken=$SpmToken" + $local:HelmSet = " --set global.logzioSpmToken=$SpmToken" $local:Message = "Logz.io SPM token Helm set is '$HelmSet'" Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/traces.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/traces.ps1 index 366108b3e..be897f222 100755 --- a/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/traces.ps1 +++ b/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/traces.ps1 @@ -18,8 +18,6 @@ Invoke-Task 'Get-LogzioTracesToken' @{} 'Getting Logz.io traces token' @($Traces Invoke-Task 'Build-EnableTracesHelmSet' @{} 'Building enable traces Helm set' @($TracesFunctionsScript) # Build Logz.io traces token Helm set Invoke-Task 'Build-LogzioTracesTokenHelmSet' @{TracesToken = $script:TracesToken} 'Building Logz.io traces token Helm set' @($TracesFunctionsScript) -# Build Logz.io region Helm set -Invoke-Task 'Build-LogzioRegionHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io region Helm set' @($TracesFunctionsScript) # Get Logz.io SPM token Invoke-Task 'Get-LogzioSpmToken' @{} 'Getting Logz.io SPM token' @($TracesFunctionsScript) # Build enable SPM Helm set diff --git a/datasources/windows/kubernetes/gke/security/telemetry/logs/functions.ps1 b/datasources/windows/kubernetes/gke/security/telemetry/logs/functions.ps1 index 6b977fc8a..505981199 100755 --- a/datasources/windows/kubernetes/gke/security/telemetry/logs/functions.ps1 +++ b/datasources/windows/kubernetes/gke/security/telemetry/logs/functions.ps1 @@ -2,37 +2,6 @@ ################################################### WINDOWS Logs Functions ###################################################### ################################################################################################################################# -# Gets Logz.io logs token -# Input: -# --- -# Output: -# LogsToken - Logz.io logs token -function Get-LogzioLogsToken { - $local:ExitCode = 1 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Getting Logz.io logs token ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Get-JsonFileFieldValue $script:AgentJson '.shippingTokens.LOG_ANALYTICS' - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ShippingToken = $script:JsonValue - - $Message = "Logz.io logs token is '$ShippingToken'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogsToken = '$ShippingToken'" -} - # Builds enable security report Helm set # Input: # --- @@ -55,128 +24,3 @@ function Build-EnableSecurityReportHelmSet { Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" } - -# Builds Logz.io Trivy logs listener url Helm set -# Input: -# FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# HelmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsListenerUrlHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 6 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs listener URL Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('ListenerUrl') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:ListenerUrl = $FuncArgs.ListenerUrl - - $local:HelmSet = " --set logzio-trivy.secrets.logzioListener=$ListenerUrl" - - $Message = "Logz.io Trivy logs listener url Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Logz.io Trivy logs token Helm set -# Input: -# FuncArgs - Hashtable {LogsToken = $script:LogsToken} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-LogzioTrivyLogsTokenHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 7 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Logz.io Trivy logs token Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('LogsToken') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:LogsToken = $FuncArgs.LogsToken - - $local:HelmSet = " --set logzio-trivy.secrets.logzioShippingToken=$LogsToken" - - $Message = "Logz.io Trivy logs token Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} - -# Builds Trivy environment id Helm set -# Input: -# FuncArgs - Hashtable {EnvId = $script:EnvId} -# Output: -# LogHelmSets - Containt all the Helm sets for logging -# helmSets - Contains all the Helm sets -function Build-TrivyEnvironmentIdHelmSet { - param ( - [hashtable]$FuncArgs - ) - - $local:ExitCode = 8 - $local:FuncName = $MyInvocation.MyCommand.Name - - $local:Message = 'Building Trivy environment id Helm set ...' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - $local:Err = Test-AreFuncArgsExist $FuncArgs @('EnvId') - if ($Err.Count -ne 0) { - $Message = "logs.ps1 ($ExitCode): $($Err[0])" - Send-LogToLogzio $script:LogLevelError $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-TaskPostRun "Write-Error `"$Message`"" - - return $ExitCode - } - - $local:EnvId = $FuncArgs.EnvId - - if ([string]::IsNullOrEmpty($EnvId)) { - $Message = 'Environment id is empty. Default value will be used' - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - return - } - - $local:HelmSet = " --set logzio-trivy.env_id=$EnvId" - - $Message = "Trivy Environment id Helm set is '$HelmSet'" - Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepLogs $script:LogScriptLogs $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource - Write-Log $script:LogLevelDebug $Message - - Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'" - Write-TaskPostRun "`$script:HelmSets += '$HelmSet'" -} diff --git a/datasources/windows/kubernetes/gke/security/telemetry/logs/logs.ps1 b/datasources/windows/kubernetes/gke/security/telemetry/logs/logs.ps1 index 274d23f68..3138e0094 100755 --- a/datasources/windows/kubernetes/gke/security/telemetry/logs/logs.ps1 +++ b/datasources/windows/kubernetes/gke/security/telemetry/logs/logs.ps1 @@ -12,16 +12,12 @@ Write-Host 'Logs' -ForegroundColor Magenta -NoNewline Write-Host ' ###' Write-Host '############' -# Get Logz.io logs token -Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) # Build enable security report Helm set Invoke-Task 'Build-EnableSecurityReportHelmSet' @{} 'Building enable security report Helm set' @($LogsFunctionsScript) -# Build Logz.io Trivy logs listener url Helm set -Invoke-Task 'Build-LogzioTrivyLogsListenerUrlHelmSet' @{ListenerUrl = $script:ListenerUrl} 'Building Logz.io Trivy logs listener url Helm set' @($LogsFunctionsScript) # Build Logz.io Trivy logs token Helm set -Invoke-Task 'Build-LogzioTrivyLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) -# Build Trivy environment id Helm set -Invoke-Task 'Build-TrivyEnvironmentIdHelmSet' @{EnvId = $script:EnvId} 'Building Trivy environment id Helm set' @($LogsFunctionsScript) +. ..\..\..\kubernetes\telemetry\logs\functions.ps1 +Invoke-Task 'Get-LogzioLogsToken' @{} 'Getting Logz.io logs token' @($LogsFunctionsScript) +Invoke-Task 'Build-LogzioLogsTokenHelmSet' @{LogsToken = $script:LogsToken} 'Building Logz.io Trivy logs token Helm set' @($LogsFunctionsScript) # Finished successfully Exit 0 diff --git a/resources-linux/k8s/datasource_installer_utils.bash b/resources-linux/k8s/datasource_installer_utils.bash index 40eb0ccda..3b36227b1 100755 --- a/resources-linux/k8s/datasource_installer_utils.bash +++ b/resources-linux/k8s/datasource_installer_utils.bash @@ -232,30 +232,7 @@ function build_no_windows_toleration_helm_sets { echo -e "$toleration_helm_sets" } -# Builds enable metrics or traces Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_enable_metrics_or_traces_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building enable metrics or traces Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=' --set metricsOrTraces.enabled=true' - - message="Enable metrics or traces Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds metrics/traces environment tag Helm set +# Builds environment tag Helm set # Input: # --- # Output: @@ -268,7 +245,7 @@ function build_environment_tag_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.p8s_logzio_name=$ENV_ID" + local helm_set=" --set global.env_id=$ENV_ID" message="Environment tag Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -278,25 +255,31 @@ function build_environment_tag_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds metrics/traces environment id helm set +# Builds Logz.io logs region Helm set # Input: # --- # Output: # LOG_HELM_SETS - Contains all the Helm sets for logging # HELM_SETS - Contains all the Helm sets -function build_environment_id_helm_set { +function build_logzio_region_helm_set { local func_name="${FUNCNAME[0]}" - local message='Building environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" + local message='Building Logz.io logs region Helm set ...' + send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.env_id=$ENV_ID" + local region=$(get_logzio_region "$LISTENER_URL") - message="Environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" + message="Logz.io region is '$region'" + send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" + write_log "$LOG_LEVEL_DEBUG" "$message" + + local helm_set=" --set global.logzioRegion=$region" + + message="Logz.io region Helm set is '$helm_set'" + send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" write_task_post_run "LOG_HELM_SETS+='$helm_set'" write_task_post_run "HELM_SETS+='$helm_set'" -} +} \ No newline at end of file diff --git a/resources-linux/k8s/datasource_logs_utils.bash b/resources-linux/k8s/datasource_logs_utils.bash index 52d855de7..fa09b6627 100755 --- a/resources-linux/k8s/datasource_logs_utils.bash +++ b/resources-linux/k8s/datasource_logs_utils.bash @@ -65,35 +65,6 @@ function build_disable_fluentd_log_collection_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io logs region Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_logs_region_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io logs region Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local region=$(get_logzio_region "$LISTENER_URL") - - message="Logz.io region is '$region'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-logs-collector.secrets.logzioRegion=$region" - - message="Logz.io region Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds Logz.io logs token Helm set # Input: # --- @@ -101,13 +72,19 @@ function build_logzio_logs_region_helm_set { # LOG_HELM_SETS - Contains all the Helm sets for logging # HELM_SETS - Contains all the Helm sets function build_logzio_logs_token_helm_set { + # Add logs token only once + if [[ -f "$IS_LOG_TOKEN_ADDED" ]]; then + return + else + sudo touch "$IS_LOG_TOKEN_ADDED" + fi local func_name="${FUNCNAME[0]}" local message='Building Logz.io logs token Helm set ...' send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-logs-collector.secrets.logzioLogsToken=$LOGS_TOKEN" + local helm_set=" --set global.logzioLogsToken=$LOGS_TOKEN" message="Logz.io logs token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -117,29 +94,6 @@ function build_logzio_logs_token_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds environment id Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_environment_id_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-logs-collector.secrets.env_id=$ENV_ID" - - message="Environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds enable security report Helm set # Input: # --- @@ -163,75 +117,6 @@ function build_enable_security_report_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io Trivy logs listener URL Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_trivy_logs_listener_url_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io Trivy logs listener url Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-trivy.secrets.logzioListener=$LISTENER_URL" - - message="Logz.io Trivy logs listener url Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io Trivy logs token Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_trivy_logs_token_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io Trivy logs token Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-trivy.secrets.logzioShippingToken=$LOGS_TOKEN" - - message="Logz.io Trivy logs token Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Trivy environment id helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_trivy_environment_id_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Trivy environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-trivy.env_id=$ENV_ID" - - message="Trivy environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds enable deploy events Helm set # Input: # --- @@ -251,75 +136,6 @@ function build_enable_deploy_events_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io deploy events logs listener URL Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_deploy_events_logs_listener_url_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io deploy events logs listener url Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-events.secrets.logzioListener=$LISTENER_URL" - - message="Logz.io deploy events logs listener url Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io deploy events logs token Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_deploy_events_logs_token_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io deploy events logs token Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-events.secrets.logzioShippingToken=$LOGS_TOKEN" - - message="Logz.io deploy events logs token Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds deploy events environment id helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_deploy_events_environment_id_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building deploy events environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-events.secrets.env_id=$ENV_ID" - - message="Deploy events environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - write_task_post_run "LOG_HELM_SETS+='$helm_set'" write_task_post_run "HELM_SETS+='$helm_set'" } \ No newline at end of file diff --git a/resources-linux/k8s/datasource_metrics_utils.bash b/resources-linux/k8s/datasource_metrics_utils.bash index 9c9bde288..dadb92851 100755 --- a/resources-linux/k8s/datasource_metrics_utils.bash +++ b/resources-linux/k8s/datasource_metrics_utils.bash @@ -27,30 +27,6 @@ function build_enable_metrics_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io metrics listener URL Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_metrics_listener_url_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io metrics listener url Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local listener_url="https://$LISTENER_URL:8053" - local helm_set=" --set logzio-k8s-telemetry.secrets.ListenerHost=$listener_url" - - local message="Logz.io metrics listener url Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds Logz.io metrics token Helm set # Input: # --- @@ -64,7 +40,7 @@ function build_logzio_metrics_token_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.MetricsToken=$METRICS_TOKEN" + local helm_set=" --set global.logzioMetricsToken=$METRICS_TOKEN" local message="Logz.io metrics token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -189,60 +165,3 @@ function build_enable_object_logs_helm_set { write_task_post_run "LOG_HELM_SETS+='$helm_set'" write_task_post_run "HELM_SETS+='$helm_set'" } - -# Builds Logz.io region Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_region_helm_set { - local func_name="${FUNCNAME[0]}" - - # Check if LogzioRegion already exists in HelmSets - if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then - return - fi - - local message='Building Logz.io region Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local region=$(get_logzio_region "$LISTENER_URL") - - message="Logz.io region is '$region'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-telemetry.secrets.LogzioRegion=$region" - - message="Logz.io region Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io metrics token Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_object_logs_token_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io Kubernetes object logs token Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken=$LOGS_TOKEN" - - local message="Logz.io Kubernetes object logs token Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} diff --git a/resources-linux/k8s/datasource_traces_utils.bash b/resources-linux/k8s/datasource_traces_utils.bash index ea88df64d..7382e3ac9 100755 --- a/resources-linux/k8s/datasource_traces_utils.bash +++ b/resources-linux/k8s/datasource_traces_utils.bash @@ -17,7 +17,7 @@ function build_enable_traces_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.traces.enabled=true" + local helm_set=" --set logzio-apm-collector.enabled=true" message="Enable traces Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -40,7 +40,7 @@ function build_logzio_traces_token_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.TracesToken=$TRACES_TOKEN" + local helm_set=" --set global.logzioTracesToken=$TRACES_TOKEN" message="Logz.io traces token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -50,40 +50,6 @@ function build_logzio_traces_token_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io region Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_region_helm_set { - local func_name="${FUNCNAME[0]}" - - # Check if LogzioRegion already exists in HelmSets - if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then - return - fi - - local message='Building Logz.io region Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local region=$(get_logzio_region "$LISTENER_URL") - - message="Logz.io region is '$region'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-telemetry.secrets.LogzioRegion=$region" - - message="Logz.io region Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds enable SPM Helm set # Input: # --- @@ -97,7 +63,7 @@ function build_enable_spm_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.spm.enabled=true" + local helm_set=" --set logzio-apm-collector.spm.enabled=true --set logzio-apm-collector.serviceGraph.enabled=true" message="Enable SPM Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -120,7 +86,7 @@ function build_logzio_spm_token_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.SpmToken=$METRICS_TOKEN" + local helm_set=" --set global.logzioSpmToken=$METRICS_TOKEN" message="Logz.io SPM token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" diff --git a/resources-mac/k8s/datasource_installer_utils.bash b/resources-mac/k8s/datasource_installer_utils.bash index a7c0b94d5..cec79a36c 100755 --- a/resources-mac/k8s/datasource_installer_utils.bash +++ b/resources-mac/k8s/datasource_installer_utils.bash @@ -232,30 +232,7 @@ function build_no_windows_toleration_helm_sets { echo -e "$toleration_helm_sets" } -# Builds enable metrics or traces Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_enable_metrics_or_traces_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building enable metrics or traces Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=' --set metricsOrTraces.enabled=true' - - message="Enable metrics or traces Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds metrics/traces environment tag Helm set +# Builds environment tag Helm set # Input: # --- # Output: @@ -268,7 +245,7 @@ function build_environment_tag_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.p8s_logzio_name=$ENV_ID" + local helm_set=" --set global.env_id=$ENV_ID" message="Environment tag Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -278,23 +255,29 @@ function build_environment_tag_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds metrics/traces environment id helm set +# Builds Logz.io logs region Helm set # Input: # --- # Output: # LOG_HELM_SETS - Contains all the Helm sets for logging # HELM_SETS - Contains all the Helm sets -function build_environment_id_helm_set { +function build_logzio_region_helm_set { local func_name="${FUNCNAME[0]}" - local message='Building environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" + local message='Building Logz.io logs region Helm set ...' + send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.env_id=$ENV_ID" + local region=$(get_logzio_region "$LISTENER_URL") - message="Environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_INSTALLATION" "$LOG_SCRIPT_INSTALLER" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" + message="Logz.io region is '$region'" + send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" + write_log "$LOG_LEVEL_DEBUG" "$message" + + local helm_set=" --set global.logzioRegion=$region" + + message="Logz.io region Helm set is '$helm_set'" + send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" write_task_post_run "LOG_HELM_SETS+='$helm_set'" diff --git a/resources-mac/k8s/datasource_logs_utils.bash b/resources-mac/k8s/datasource_logs_utils.bash index eeeec97ec..17c8efbda 100755 --- a/resources-mac/k8s/datasource_logs_utils.bash +++ b/resources-mac/k8s/datasource_logs_utils.bash @@ -65,35 +65,6 @@ function build_disable_fluentd_log_collection_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io logs region Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_logs_region_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io logs region Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local region=$(get_logzio_region "$LISTENER_URL") - - message="Logz.io region is '$region'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-logs-collector.secrets.logzioRegion=$region" - - message="Logz.io region Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds Logz.io logs token Helm set # Input: # --- @@ -101,13 +72,19 @@ function build_logzio_logs_region_helm_set { # LOG_HELM_SETS - Contains all the Helm sets for logging # HELM_SETS - Contains all the Helm sets function build_logzio_logs_token_helm_set { + # Add logs token only once + if [[ -f "$IS_LOG_TOKEN_ADDED" ]]; then + return + else + sudo touch "$IS_LOG_TOKEN_ADDED" + fi local func_name="${FUNCNAME[0]}" local message='Building Logz.io logs token Helm set ...' send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-logs-collector.secrets.logzioLogsToken=$LOGS_TOKEN" + local helm_set=" --set global.logzioLogsToken=$LOGS_TOKEN" message="Logz.io logs token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -117,28 +94,6 @@ function build_logzio_logs_token_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds environment id Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_environment_id_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-logs-collector.secrets.env_id=$ENV_ID" - - message="Environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} # Builds enable security report Helm set # Input: @@ -163,75 +118,6 @@ function build_enable_security_report_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io Trivy logs listener URL Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_trivy_logs_listener_url_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io Trivy logs listener url Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-trivy.secrets.logzioListener=$LISTENER_URL" - - message="Logz.io Trivy logs listener url Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io Trivy logs token Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_trivy_logs_token_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io Trivy logs token Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-trivy.secrets.logzioShippingToken=$LOGS_TOKEN" - - message="Logz.io Trivy logs token Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Trivy environment id helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_trivy_environment_id_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Trivy environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-trivy.env_id=$ENV_ID" - - message="Trivy environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds enable deploy events Helm set # Input: # --- @@ -254,72 +140,3 @@ function build_enable_deploy_events_helm_set { write_task_post_run "LOG_HELM_SETS+='$helm_set'" write_task_post_run "HELM_SETS+='$helm_set'" } - -# Builds Logz.io deploy events logs listener URL Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_deploy_events_logs_listener_url_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io deploy events logs listener url Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-events.secrets.logzioListener=$LISTENER_URL" - - message="Logz.io deploy events logs listener url Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io deploy events logs token Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_deploy_events_logs_token_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io deploy events logs token Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-events.secrets.logzioShippingToken=$LOGS_TOKEN" - - message="Logz.io deploy events logs token Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds deploy events environment id helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_deploy_events_environment_id_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building deploy events environment id Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-events.secrets.env_id=$ENV_ID" - - message="Deploy events environment id Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_LOGS" "$LOG_SCRIPT_LOGS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} \ No newline at end of file diff --git a/resources-mac/k8s/datasource_metrics_utils.bash b/resources-mac/k8s/datasource_metrics_utils.bash index dae905581..da4d426d0 100755 --- a/resources-mac/k8s/datasource_metrics_utils.bash +++ b/resources-mac/k8s/datasource_metrics_utils.bash @@ -27,30 +27,6 @@ function build_enable_metrics_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io metrics listener URL Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_metrics_listener_url_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io metrics listener url Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local listener_url="https://$LISTENER_URL:8053" - local helm_set=" --set logzio-k8s-telemetry.secrets.ListenerHost=$listener_url" - - local message="Logz.io metrics listener url Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds Logz.io metrics token Helm set # Input: # --- @@ -64,7 +40,7 @@ function build_logzio_metrics_token_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.MetricsToken=$METRICS_TOKEN" + local helm_set=" --set global.logzioMetricsToken=$METRICS_TOKEN" local message="Logz.io metrics token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -189,60 +165,3 @@ function build_enable_object_logs_helm_set { write_task_post_run "LOG_HELM_SETS+='$helm_set'" write_task_post_run "HELM_SETS+='$helm_set'" } - -# Builds Logz.io region Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_region_helm_set { - local func_name="${FUNCNAME[0]}" - - # Check if LogzioRegion already exists in HelmSets - if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then - return - fi - - local message='Building Logz.io region Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local region=$(get_logzio_region "$LISTENER_URL") - - message="Logz.io region is '$region'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-telemetry.secrets.LogzioRegion=$region" - - message="Logz.io region Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - -# Builds Logz.io metrics token Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_object_logs_token_helm_set { - local func_name="${FUNCNAME[0]}" - - local message='Building Logz.io Kubernetes object logs token Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken=$LOGS_TOKEN" - - local message="Logz.io Kubernetes object logs token Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} \ No newline at end of file diff --git a/resources-mac/k8s/datasource_traces_utils.bash b/resources-mac/k8s/datasource_traces_utils.bash index af97d856b..be3f98e65 100755 --- a/resources-mac/k8s/datasource_traces_utils.bash +++ b/resources-mac/k8s/datasource_traces_utils.bash @@ -17,7 +17,7 @@ function build_enable_traces_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.traces.enabled=true" + local helm_set=" --set logzio-apm-collector.enabled=true" message="Enable traces Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -40,7 +40,7 @@ function build_logzio_traces_token_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.TracesToken=$TRACES_TOKEN" + local helm_set=" --set global.logzioTracesToken=$TRACES_TOKEN" message="Logz.io traces token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -50,40 +50,6 @@ function build_logzio_traces_token_helm_set { write_task_post_run "HELM_SETS+='$helm_set'" } -# Builds Logz.io region Helm set -# Input: -# --- -# Output: -# LOG_HELM_SETS - Contains all the Helm sets for logging -# HELM_SETS - Contains all the Helm sets -function build_logzio_region_helm_set { - local func_name="${FUNCNAME[0]}" - - # Check if LogzioRegion already exists in HelmSets - if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then - return - fi - - local message='Building Logz.io region Helm set ...' - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local region=$(get_logzio_region "$LISTENER_URL") - - message="Logz.io region is '$region'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - local helm_set=" --set logzio-k8s-telemetry.secrets.LogzioRegion=$region" - - message="Logz.io region Helm set is '$helm_set'" - send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" - write_log "$LOG_LEVEL_DEBUG" "$message" - - write_task_post_run "LOG_HELM_SETS+='$helm_set'" - write_task_post_run "HELM_SETS+='$helm_set'" -} - # Builds enable SPM Helm set # Input: # --- @@ -97,7 +63,7 @@ function build_enable_spm_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.spm.enabled=true" + local helm_set=" --set logzio-apm-collector.spm.enabled=true --set logzio-apm-collector.serviceGraph.enabled=true" message="Enable SPM Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" @@ -120,7 +86,7 @@ function build_logzio_spm_token_helm_set { send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" write_log "$LOG_LEVEL_DEBUG" "$message" - local helm_set=" --set logzio-k8s-telemetry.secrets.SpmToken=$METRICS_TOKEN" + local helm_set=" --set global.logzioSpmToken=$METRICS_TOKEN" message="Logz.io SPM token Helm set is '$helm_set'" send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE" diff --git a/scripts/linux/consts.bash b/scripts/linux/consts.bash index 9dec9bcf8..f93471d72 100755 --- a/scripts/linux/consts.bash +++ b/scripts/linux/consts.bash @@ -156,4 +156,7 @@ GREEN_COLOR_BOLD='\033[0;32m' ## Headers AGENT_VERSION=$(cat "$LOGZIO_TEMP_DIR/version") USER_AGENT_LOGS="logzio-linux-version-$AGENT_VERSION-logs" -USER_AGENT_METRICS="logzio-linux-version-$AGENT_VERSION-metrics" \ No newline at end of file +USER_AGENT_METRICS="logzio-linux-version-$AGENT_VERSION-metrics" + +## K8s global flag added indication +IS_LOG_TOKEN_ADDED="$LOGZIO_TEMP_DIR/is-log-token-added.txt" \ No newline at end of file diff --git a/scripts/mac/consts.bash b/scripts/mac/consts.bash index 178b54438..0f993c07c 100755 --- a/scripts/mac/consts.bash +++ b/scripts/mac/consts.bash @@ -169,4 +169,7 @@ GREEN_COLOR_BOLD='\033[0;32m' ## Headers AGENT_VERSION=$(cat "$LOGZIO_TEMP_DIR/version") USER_AGENT_LOGS="logzio-mac-version-$AGENT_VERSION-logs" -USER_AGENT_METRICS="logzio-mac-version-$AGENT_VERSION-metrics" \ No newline at end of file +USER_AGENT_METRICS="logzio-mac-version-$AGENT_VERSION-metrics" + +## K8s global flag added indication +IS_LOG_TOKEN_ADDED="$LOGZIO_TEMP_DIR/is-log-token-added.txt" \ No newline at end of file diff --git a/version b/version index 7c9430a1b..46b105a30 100644 --- a/version +++ b/version @@ -1 +1 @@ -v1.1.39 +v2.0.0