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 conditions checking on autodiscover Docker labels #6412

Merged
merged 1 commit into from
Feb 20, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Feb 19, 2018

Type was wrong (map[string]string instead of MapStr) so autodiscover conditions on Docker labels were not being processed.

@exekias exekias added bug in progress Pull request is currently in progress. libbeat needs_backport PR is waiting to be backported to other branches. labels Feb 19, 2018
@exekias exekias changed the title Fix autodiscover Docker labels processing Fix conditions on autodiscover Docker labels Feb 19, 2018
@exekias exekias changed the title Fix conditions on autodiscover Docker labels Fix conditions checking on autodiscover Docker labels Feb 19, 2018
@exekias exekias force-pushed the fix-autodiscover-docker-labels branch from 76c2d0f to 33ca0d6 Compare February 19, 2018 15:10
Type was wrong (map[string]string instead of MapStr) so labels were not
being processed.
@exekias exekias force-pushed the fix-autodiscover-docker-labels branch from 33ca0d6 to f1b38e6 Compare February 19, 2018 15:19
@exekias exekias added review v6.3.0 v6.2.2 and removed in progress Pull request is currently in progress. labels Feb 19, 2018
@ruflin ruflin merged commit db49ae8 into elastic:master Feb 20, 2018
exekias added a commit to exekias/beats that referenced this pull request Feb 20, 2018
Type was wrong (map[string]string instead of MapStr) so labels were not
being processed.
(cherry picked from commit db49ae8)
@exekias exekias removed the needs_backport PR is waiting to be backported to other branches. label Feb 20, 2018
ph pushed a commit that referenced this pull request Feb 20, 2018
…ker labels (#6420)

* Fix autodiscover Docker labels processing (#6412)

Type was wrong (map[string]string instead of MapStr) so labels were not
being processed.
(cherry picked from commit db49ae8)
@tsg tsg added v6.2.3 and removed v6.2.2 labels Mar 15, 2018
@m4ce
Copy link

m4ce commented Mar 29, 2018

How can this be used in autodiscovery? This doesn't seem to work:

filebeat.autodiscover:
  providers:
    - type: docker
      templates:
        - condition:
            equals:
              docker.container.labels:
                "filebeat.enable": "true"

I am using 6.2.3.

@m4ce
Copy link

m4ce commented Mar 29, 2018

The condition seems to be wrong?

-> New condition equals: map[docker.container.labels.filebeat.enable:true]

@ruflin
Copy link
Contributor

ruflin commented Mar 30, 2018

@m4ce Could you open a topic on discuss with this? https://discuss.elastic.co/c/beats/filebeat Please provide there also the list of labels you have in docker.

leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…ver Docker labels (elastic#6420)

* Fix autodiscover Docker labels processing (elastic#6412)

Type was wrong (map[string]string instead of MapStr) so labels were not
being processed.
(cherry picked from commit 62aa907)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants