Skip to content

Port IncludeAnnotations setting to Agent and small manifest fix#28247

Merged
ChrsMark merged 6 commits intoelastic:masterfrom
ChrsMark:fix_k8s_agent_manifests
Oct 5, 2021
Merged

Port IncludeAnnotations setting to Agent and small manifest fix#28247
ChrsMark merged 6 commits intoelastic:masterfrom
ChrsMark:fix_k8s_agent_manifests

Conversation

@ChrsMark
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark commented Oct 5, 2021 •
edited
Loading

What does this PR do?

Small followup fix related to #27691:

  • Fix proposed manifest's condition from kubernetes.pod.labels.app == redis to ``kubernetes.labels.app == redis`
  • Port IncludeAnnotations
  • Handle start/stop of watchers properly

How to test this PR manually

Using the following redis Pod:

apiVersion: v1
kind: Pod
metadata:
  name: redis
  labels:
    role: main
    app: redis
  annotations:
    level: production
spec:
  hostNetwork: true
  dnsPolicy: ClusterFirstWithHostNet
  containers:
    - name: redis
      image: redis:latest
      ports:
        - name: web
          containerPort: 6379
          protocol: TCP

Test the following scenarios:

  1. Check Pod's annotation is added as metadata
providers.kubernetes:
  scope: node
  kube_config: /Users/chrismark/.kube/config
  node: "kind-control-plane"
  cleanup_timeout: 360s
  include_annotations: ["level"]
  resources:
    pod:
      enabled: true

inputs:
- name: redis
  type: redis/metrics
  use_output: default
  meta:
    package:
      name: redis
      version: 0.3.6
  data_stream:
    namespace: default
  streams:
    - data_stream:
        dataset: redis.info
        type: metrics
      metricsets:
        - info
      hosts:
        - '${kubernetes.pod.ip}:${kubernetes.container.port}'
      idle_timeout: 20s
      maxconn: 10
      network: tcp
      period: 10s
      condition: ${kubernetes.labels.app} == 'redis' AND ${kubernetes.container.port_name} == 'web'
  1. Check condition based on kubernetes.namespace_annotations.foo == bar

kubectl annotate ns default foo=bar

providers.kubernetes:
  scope: node
  kube_config: /Users/chrismark/.kube/config
  node: "kind-control-plane"
  cleanup_timeout: 360s
  include_annotations: ["level"]
  resources:
    pod:
      enabled: true

inputs:
- name: redis
  type: redis/metrics
  use_output: default
  meta:
    package:
      name: redis
      version: 0.3.6
  data_stream:
    namespace: default
  streams:
    - data_stream:
        dataset: redis.info
        type: metrics
      metricsets:
        - info
      hosts:
        - '${kubernetes.pod.ip}:${kubernetes.container.port}'
      idle_timeout: 20s
      maxconn: 10
      network: tcp
      period: 10s
      condition: ${kubernetes.namespace_annotations.foo} == 'bar' AND ${kubernetes.container.port_name} == 'web'
  1. Check that ns annotations are being added to Pod's metadata.
providers.kubernetes:
 scope: node
 kube_config: /Users/chrismark/.kube/config
 node: "kind-control-plane"
 cleanup_timeout: 360s
 include_annotations: ["level"]
 add_resource_metadata:
    namespace:
      include_annotations: ["foo"]
 resources:
   pod:
     enabled: true

inputs:
- name: redis
 type: redis/metrics
 use_output: default
 meta:
   package:
     name: redis
     version: 0.3.6
 data_stream:
   namespace: default
 streams:
   - data_stream:
       dataset: redis.info
       type: metrics
     metricsets:
       - info
     hosts:
       - '${kubernetes.pod.ip}:${kubernetes.container.port}'
     idle_timeout: 20s
     maxconn: 10
     network: tcp
     period: 10s
     condition: ${kubernetes.labels.app} == 'redis' AND ${kubernetes.container.port_name} == 'web'

@ChrsMark
Port IncludeAnnotations setting to Agent and small mainfest fix
b02f663 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@ChrsMark ChrsMark added Team:Integrations Label for the Integrations team backport-v7.16.0 Automated backport with mergify labels Oct 5, 2021
@ChrsMark ChrsMark self-assigned this Oct 5, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 5, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 5, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 5, 2021
@ChrsMark ChrsMark changed the title Port IncludeAnnotations setting to Agent and small mainfest fix Port IncludeAnnotations setting to Agent and small manifest fix Oct 5, 2021
@ChrsMark
Fix Eventers' start/stop
4ba9b8c 
Signed-off-by: chrismark <chrismarkou92@gmail.com>
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 5, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 129 min 3 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

MichaelKatsoulis
MichaelKatsoulis approved these changes Oct 5, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@MichaelKatsoulis MichaelKatsoulis left a comment

Choose a reason for hiding this comment

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

LGTM with some minor cosmetic updates.

@MichaelKatsoulis MichaelKatsoulis mentioned this pull request Oct 5, 2021
Merged
6 tasks
ChrsMark and others added 4 commits October 5, 2021 15:14
@ChrsMark @MichaelKatsoulis
Update x-pack/elastic-agent/pkg/composable/providers/kubernetes/kuber…
33815e1 
…netes.go

Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark @MichaelKatsoulis
Update x-pack/elastic-agent/pkg/composable/providers/kubernetes/node.go
ca67350 
Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark @MichaelKatsoulis
Update x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod.go
a11bb95 
Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark @MichaelKatsoulis
Update x-pack/elastic-agent/pkg/composable/providers/kubernetes/servi…
722010b 
…ce.go

Co-authored-by: Michael Katsoulis <michaelkatsoulis88@gmail.com>
@ChrsMark ChrsMark merged commit a690364 into elastic:master Oct 5, 2021
@mergify mergify bot mentioned this pull request Oct 5, 2021
Merged
mergify bot pushed a commit that referenced this pull request Oct 5, 2021
@ChrsMark
Port IncludeAnnotations setting to Agent and small manifest fix (#28247)
8c030b2 
(cherry picked from commit a690364)
ChrsMark added a commit that referenced this pull request Oct 5, 2021
@mergify @ChrsMark
Port IncludeAnnotations setting to Agent and small manifest fix (#28247…
19e4d78 
…) (#28254)

(cherry picked from commit a690364)

Co-authored-by: Chris Mark <chrismarkou92@gmail.com>
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
@ChrsMark
Port IncludeAnnotations setting to Agent and small manifest fix (elas…
b9a02b5 
…tic#28247)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaelKatsoulis MichaelKatsoulis MichaelKatsoulis approved these changes

Assignees

@ChrsMark ChrsMark

Labels

backport-v7.16.0 Automated backport with mergify Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ChrsMark @elasticmachine @MichaelKatsoulis