Skip to content
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.

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

! Fix the prometheus_conf_writing_conf macro #564

Merged
merged 2 commits into from
Mar 25, 2019
Merged

! Fix the prometheus_conf_writing_conf macro #564

merged 2 commits into from
Mar 25, 2019

Conversation

JPLachance
Copy link
Contributor

Greetings!

prometheus-conf started to appear in Falco events as "Write below etc" after an upgrade:

{
    "container.id": "2d3204ad6f6a",
    "evt.time": 1552573221328947059,
    "fd.name": "/etc/prometheus/config_out/rules.tmp/rules-0/system.rules",
    "k8s.ns.name": "monitoring",
    "k8s.pod.name": "prometheus-prometheus-1",
    "proc.aname[2]": "docker-containe",
    "proc.aname[3]": "dockerd",
    "proc.aname[4]": "systemd",
    "proc.cmdline": "prometheus-conf --reload-url=http://localhost:9090/-/reload --config-file=/etc/prometheus/config/prometheus.yaml --rule-list-file=/etc/prometheus/config/configmaps.json --config-envsubst-file=/etc/prometheus/config_out/prometheus.env.yaml --rule-dir=/etc/prometheus/config_out/rules",
    "proc.name": "prometheus-conf",
    "proc.pcmdline": "docker-containe 2d3204ad6f6a8b49d2194c2a8def43034e30f208a2f3525539fd382ce2a0360f /var/run/docker/libcontainerd/2d3204ad6f6a8b49d2194c2a8def43034e30f208a2f3525539fd382ce2a0360f docker-runc",
    "proc.pname": "docker-containe",
    "user.name": "root"
}

This PR updates the existing prometheus_conf_writing_conf macro and fixes the problem.

Enjoy!

falco-CLA-1.0-contributing-entity: Coveo Solutions Inc.
falco-CLA-1.0-signed-off-by: Jean-Philippe Lachance <jplachance@coveo.com>
Copy link
Contributor

@mstemm mstemm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much for the changes? Just one thing about parentheses.

rules/falco_rules.yaml Outdated Show resolved Hide resolved
falco-CLA-1.0-contributing-entity: Coveo Solutions Inc.
falco-CLA-1.0-signed-off-by: Jean-Philippe Lachance <jplachance@coveo.com>
@mstemm mstemm merged commit 7b0b498 into falcosecurity:dev Mar 25, 2019
@JPLachance JPLachance deleted the fix-prometheus-conf-writing-conf branch March 29, 2019 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants