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.

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

fix system test for kubernetes integration for k8s v1.27.0 #6310

Merged
merged 4 commits into from
May 26, 2023
Merged

fix system test for kubernetes integration for k8s v1.27.0 #6310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9d0b0b
fix system test for kubernetes integration for k8s v1.27.0
gsantoro May 24, 2023
ac6dbd2
Merge branch 'main' into feature/k8s_1.27.0
gsantoro May 24, 2023
76f794c
Merge remote-tracking branch 'origin' into feature/k8s_1.27.0
gsantoro May 26, 2023
d77db00
updated changelog
gsantoro May 26, 2023
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
2 changes: 1 addition & 1 deletion packages/kubernetes/_dev/deploy/k8s/ss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
terminationGracePeriodSeconds: 10
containers:
- name: nginx
image: k8s.gcr.io/nginx-slim:0.8
image: docker.io/nginx:1.24.0-alpine-slim
ports:
- containerPort: 80
name: web
5 changes: 5 additions & 0 deletions packages/kubernetes/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.40.0"
changes:
- description: Fix system tests for kubernetes integration for k8s v1.27.0
type: bugfix
link: https://github.com/elastic/integrations/pull/1
- version: "1.40.0-beta.2"
changes:
- description: Fix volume dashboard.
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes/data_stream/container_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ streams:
title: Dataset name
description: >
Set the name for your dataset. Changing the dataset will send the data to a different index. For more info look at [data_stream field](https://www.elastic.co/guide/en/ecs/master/ecs-data_stream.html).

Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this line added? Same for the next file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's the output of elastic-package format or elastic-package lint

Copy link
Contributor

Choose a reason for hiding this comment

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

strange. Because there is not empty line under all fields. Personally I wouldn't leave this line but it's your choice.

type: text
- name: containerParserStream
type: text
Expand Down
1 change: 1 addition & 0 deletions packages/kubernetes/data_stream/state_node/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
type: keyword
description: >
Node NetworkUnavailable status (true, false or unknown)

- name: cpu
type: group
fields:
Expand Down
2 changes: 1 addition & 1 deletion packages/kubernetes/kibana/dashboard/kubernetes-bf9389f0-0c14-11ed-b760-5d1bccb47f56.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3184,4 +3184,4 @@
"type": "dashboard",
"updated_at": "2023-01-11T16:15:05.999Z",
"version": "WzM0NTEsMV0="
}
}
2 changes: 1 addition & 1 deletion packages/kubernetes/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: kubernetes
title: Kubernetes
version: 1.40.0-beta.2
version: 1.40.0
license: basic
description: Collect logs and metrics from Kubernetes clusters with Elastic Agent (TSDB Beta).
type: integration
Expand Down