Skip to content

Fix Prometheus node exporter path #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agarciamontoro merged 4 commits into from
Mar 27, 2026
Merged

Fix Prometheus node exporter path #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d01109
Fix Prometheus path
agarciamontoro Mar 25, 2026
73505bd
Actually enable ethtool collector
agarciamontoro Mar 25, 2026
786b190
Remove no-longer needed EnvironmentFile line
agarciamontoro Mar 25, 2026
485b15b
Remove outdated comment
agarciamontoro Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion deployment/terraform/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down
2 changes: 0 additions & 2 deletions deployment/terraform/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 1 addition & 7 deletions deployment/terraform/strings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`
Expand Down