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

[7.17] Add required tags to create AWS instances for CI #37717

Merged
merged 3 commits into from
Jan 25, 2024
Merged

[7.17] Add required tags to create AWS instances for CI #37717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb2b2fb
add required tags
kaiyan-sheng Jan 23, 2024
4478532
try to change credentials-id
kaiyan-sheng Jan 24, 2024
e23acbb
Merge branch '7.17' into fix_aws_7.17
kaiyan-sheng Jan 25, 2024
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 .ci/jobs/beats-schedule-weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
wipe-workspace: 'True'
name: origin
shallow-clone: true
credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
credentials-id: github-app-beats-ci
Copy link

Choose a reason for hiding this comment

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

where does this change come from? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/elastic/beats/blob/main/.ci/jobs/beats.yml#L25 I took that from here 😬

reference-repo: /var/lib/jenkins/.git-references/beats.git
branches:
- $branch_specifier
Expand Down
13 changes: 13 additions & 0 deletions x-pack/filebeat/input/awscloudwatch/_meta/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ terraform {

provider "aws" {
region = var.aws_region
default_tags {
tags = {
environment = var.ENVIRONMENT
repo = var.REPO
branch = var.BRANCH
build = var.BUILD_ID
created_date = var.CREATED_DATE
division = "engineering"
org = "obs"
team = "cloud-monitoring"
project = "filebeat_aws-ci"
}
}
}

resource "random_string" "random" {
Expand Down
23 changes: 23 additions & 0 deletions x-pack/filebeat/input/awscloudwatch/_meta/terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,26 @@ variable "aws_region" {
type = string
default = "us-east-1"
}

variable "BRANCH" {
description = "Branch name or pull request for tagging purposes"
default = "unknown-branch"
}

variable "BUILD_ID" {
description = "Build ID in the CI for tagging purposes"
default = "unknown-build"
}

variable "CREATED_DATE" {
description = "Creation date in epoch time for tagging purposes"
default = "unknown-date"
}

variable "ENVIRONMENT" {
default = "unknown-environment"
}

variable "REPO" {
default = "unknown-repo-name"
}
4 changes: 4 additions & 0 deletions x-pack/filebeat/input/awss3/_meta/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ provider "aws" {
branch = var.BRANCH
build = var.BUILD_ID
created_date = var.CREATED_DATE
division = "engineering"
org = "obs"
team = "cloud-monitoring"
project = "filebeat_aws-ci"
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions x-pack/metricbeat/module/aws/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ provider "aws" {
branch = var.BRANCH
build = var.BUILD_ID
created_date = var.CREATED_DATE
division = "engineering"
org = "obs"
team = "cloud-monitoring"
project = "metricbeat_aws-ci"
}
}
}
Expand Down
Loading