diff --git a/deployment/terraform/agent.go b/deployment/terraform/agent.go index 9f55cdaf0..d2e904509 100644 --- a/deployment/terraform/agent.go +++ b/deployment/terraform/agent.go @@ -218,7 +218,6 @@ func (t *Terraform) configureAndRunAgents(extAgent *ssh.ExtAgent) error { {srcData: strings.TrimPrefix(browserBuf.String(), "\n"), dstPath: "/lib/systemd/system/ltbrowserapi.service", msg: "Uploading load-test browser api service file"}, {srcData: strings.TrimPrefix(clientSysctlConfig, "\n"), dstPath: "/etc/sysctl.conf"}, {srcData: strings.TrimPrefix(limitsConfig, "\n"), dstPath: "/etc/security/limits.conf"}, - {srcData: strings.TrimPrefix(prometheusNodeExporterConfig, "\n"), dstPath: "/etc/default/prometheus-node-exporter"}, {srcData: strings.TrimSpace(otelcolConfigFile), dstPath: "/etc/otelcol-contrib/config.yaml"}, {srcData: agentType, dstPath: t.ExpandWithUser(dstAgentTypeFilePath), msg: "Uploading agent type file"}, } diff --git a/deployment/terraform/create.go b/deployment/terraform/create.go index 35a525df9..e820f28d7 100644 --- a/deployment/terraform/create.go +++ b/deployment/terraform/create.go @@ -476,7 +476,6 @@ func (t *Terraform) setupAppServer(extAgent *ssh.ExtAgent, ip, siteURL, serviceF {srcData: strings.TrimPrefix(serverSysctlConfig, "\n"), dstPath: "/etc/sysctl.conf"}, {srcData: strings.TrimSpace(serviceFileTemplateOutput.String()), dstPath: "/lib/systemd/system/mattermost.service"}, {srcData: strings.TrimPrefix(limitsConfig, "\n"), dstPath: "/etc/security/limits.conf"}, - {srcData: strings.TrimPrefix(prometheusNodeExporterConfig, "\n"), dstPath: "/etc/default/prometheus-node-exporter"}, {srcData: strings.TrimSpace(fmt.Sprintf(netpeekServiceFile, gossipPort)), dstPath: "/lib/systemd/system/netpeek.service"}, {srcData: strings.TrimSpace(otelcolConfig), dstPath: "/etc/otelcol-contrib/config.yaml"}, } @@ -972,7 +971,6 @@ func (t *Terraform) setupProxyServer(extAgent *ssh.ExtAgent, instance Instance) {srcData: strings.TrimLeft(serverSysctlConfig, "\n"), dstPath: "/etc/sysctl.conf"}, {srcData: strings.TrimLeft(nginxConfig, "\n"), dstPath: "/etc/nginx/nginx.conf"}, {srcData: strings.TrimLeft(limitsConfig, "\n"), dstPath: "/etc/security/limits.conf"}, - {srcData: strings.TrimPrefix(prometheusNodeExporterConfig, "\n"), dstPath: "/etc/default/prometheus-node-exporter"}, {srcData: strings.TrimSpace(otelcolConfigFile), dstPath: "/etc/otelcol-contrib/config.yaml"}, } if err := uploadBatch(sshc, batch); err != nil { diff --git a/deployment/terraform/strings.go b/deployment/terraform/strings.go index 05de39eac..d2e76ab37 100644 --- a/deployment/terraform/strings.go +++ b/deployment/terraform/strings.go @@ -552,10 +552,6 @@ KC_DB_PASSWORD=mmpass KC_DB_USERNAME=keycloak KC_DATABASE=keycloak` -const prometheusNodeExporterConfig = ` -ARGS="--collector.ethtool" -` - const netpeekServiceFile = ` [Unit] Description=netpeek @@ -575,9 +571,7 @@ const prometheusNodeExporterServiceFile = `[Unit] Description=Node Exporter [Service] -# Fallback when environment file does not exist -EnvironmentFile=-/etc/default/prometheus-node-exporter -ExecStart=/usr/local/bin/node_exporter +ExecStart=/usr/bin/prometheus-node-exporter --collector.ethtool [Install] WantedBy=multi-user.target`