Skip to content

Commit e35e4ea

Browse files
r00tu53rr00tu53r
committed
fix version
2 parents 33be902 + fb7bb2c commit e35e4ea

File tree

2,021 files changed

+285990
-363113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,021 files changed

+285990
-363113
lines changed

‎.ci/Jenkinsfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
AWS_ACCOUNT_SECRET = "secret/observability-team/ci/elastic-observability-aws-account-auth"
1313
HOME = "${env.WORKSPACE}"
1414
KIND_VERSION = "v0.11.1"
15-
K8S_VERSION = "v1.20.2"
15+
K8S_VERSION = "v1.23.0"
1616
JOB_GCS_BUCKET = 'beats-ci-temp'
1717
JOB_GCS_BUCKET_INTERNAL = 'beats-ci-temp-internal'
1818
JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'
@@ -82,7 +82,7 @@ pipeline {
8282
}
8383

8484
// Publish package to the Package Storage
85-
if (env.BRANCH_NAME == 'master') {
85+
if (env.BRANCH_NAME == 'main') {
8686
withCredentials([string(credentialsId: "${GITHUB_TOKEN_CREDENTIALS}", variable: 'GITHUB_TOKEN')]) {
8787
sh(label: 'Configure Git user.name', script: 'git config --global user.name "Elastic Machine"')
8888
sh(label: 'Configure Git user.email', script: 'git config --global user.email "elasticmachine@users.noreply.github.com"')
@@ -164,8 +164,8 @@ def isPrAffected(integrationName) {
164164
}
165165
}
166166

167-
if (env.BRANCH_NAME == "master") {
168-
echo "[${integrationName}] PR is affected: running on master branch"
167+
if (env.BRANCH_NAME == "main") {
168+
echo "[${integrationName}] PR is affected: running on main branch"
169169
return true
170170
}
171171

‎.ci/jobs/integrations-daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
1818
reference-repo: /var/lib/jenkins/.git-references/integrations.git
1919
branches:
20-
- master
20+
- main
2121
triggers:
2222
- timed: 'H H(2-5) * * *'

‎.ci/schedule-daily.groovy‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pipeline {
66
NOTIFY_TO = credentials('notify-to')
77
PIPELINE_LOG_LEVEL = 'INFO'
88
SLACK_CHANNEL = "#beats-build"
9-
INTEGRATION_JOB = 'Ingest-manager/integrations/master'
9+
INTEGRATION_JOB = 'Ingest-manager/integrations/main'
1010
}
1111
options {
1212
timeout(time: 4, unit: 'HOURS')
@@ -22,26 +22,30 @@ pipeline {
2222
cron('H H(2-5) * * *')
2323
}
2424
stages {
25-
stage('Daily integration builds with 7.16') {
26-
steps {
27-
build(
28-
job: env.INTEGRATION_JOB,
29-
parameters: [stringParam(name: 'stackVersion', value: '7.16-SNAPSHOT')],
30-
quietPeriod: 0,
31-
wait: true,
32-
propagate: true,
33-
)
34-
}
35-
}
36-
stage('Daily integration builds with 8.0') {
37-
steps {
38-
build(
39-
job: env.INTEGRATION_JOB,
40-
parameters: [stringParam(name: 'stackVersion', value: '8.0-SNAPSHOT')],
41-
quietPeriod: 0,
42-
wait: true,
43-
propagate: true,
44-
)
25+
stage('Daily integration builds') {
26+
parallel {
27+
stage('with stack v7.17') {
28+
steps {
29+
build(
30+
job: env.INTEGRATION_JOB,
31+
parameters: [stringParam(name: 'stackVersion', value: '7.17-SNAPSHOT')],
32+
quietPeriod: 0,
33+
wait: true,
34+
propagate: true,
35+
)
36+
}
37+
}
38+
stage('with stack v8.1') {
39+
steps {
40+
build(
41+
job: env.INTEGRATION_JOB,
42+
parameters: [stringParam(name: 'stackVersion', value: '8.1.0-SNAPSHOT')],
43+
quietPeriod: 0,
44+
wait: true,
45+
propagate: true,
46+
)
47+
}
48+
}
4549
}
4650
}
4751
}

‎.github/ISSUE_TEMPLATE/integration-checklist.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ when creating or updating a Package, Module or Dataset for an Integration.
1111

1212
### All changes
1313

14-
- [ ] Change follows the [contributing guidelines](https://github.com/elastic/integrations/blob/master/CONTRIBUTING.md)
14+
- [ ] Change follows the [contributing guidelines](https://github.com/elastic/integrations/blob/main/CONTRIBUTING.md)
1515
- [ ] Supported versions of the monitoring target are documented
1616
- [ ] Supported operating systems are documented (if applicable)
1717
- [ ] Integration or [System tests](https://github.com/elastic/elastic-package/blob/master/docs/howto/system_testing.md) exist

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Explain here the changes you made on the PR.
1414

1515
## Checklist
1616

17-
- [ ] I have reviewed [tips for building integrations](https://github.com/elastic/integrations/blob/master/docs/tips_for_building_integrations.md) and this pull request is aligned with them.
17+
- [ ] I have reviewed [tips for building integrations](https://github.com/elastic/integrations/blob/main/docs/tips_for_building_integrations.md) and this pull request is aligned with them.
1818
- [ ] I have verified that all data streams collect metrics or logs.
1919
- [ ] I have added an entry to my package's `changelog.yml` file.
2020
- [ ] I have verified that Kibana version constraints are current according to [guidelines](https://github.com/elastic/elastic-package/blob/master/docs/howto/stack_version_support.md#when-to-update-the-condition).

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.1
1+
1.17.6

‎.mergify.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pull_request_rules:
88
conditions:
99
- check-success=integrations/pr-merge
1010
- check-success=CLA
11-
- base=master
11+
- base=main
1212
- author~=^dependabot(|-preview)\[bot\]$
1313
actions:
1414
queue:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://beats-ci.elastic.co/job/ingest-manager/job/integrations/job/master/badge/icon)](https://beats-ci.elastic.co/job/ingest-manager/job/integrations/job/master/)
1+
[![Build Status](https://beats-ci.elastic.co/job/ingest-manager/job/integrations/job/main/badge/icon)](https://beats-ci.elastic.co/job/ingest-manager/job/integrations/job/main/)
22

33
# Elastic Integrations
44

@@ -36,4 +36,4 @@ explore the builder tools.
3636

3737
## Test Coverage
3838

39-
[![Test Coverage Report](https://beats-ci.elastic.co/job/ingest-manager/job/integrations/job/master/cobertura/graph)](https://beats-ci.elastic.co/job/Ingest-manager/job/integrations/job/master/cobertura/)
39+
[![Test Coverage Report](https://beats-ci.elastic.co/job/ingest-manager/job/integrations/job/main/cobertura/graph)](https://beats-ci.elastic.co/job/Ingest-manager/job/integrations/job/main/cobertura/)

‎docs/definitions.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ An integration is a specific type of a _package_ defining data streams used to o
1919

2020
## Data stream
2121

22-
A data stream is logical sub-division of an Integration package, dealing with a specific type of observable aspect of the service or product being observed. For example, the `mysql` package defines a data stream for collecting metrics and another data stream for collecting server logs.
22+
A data stream is logical sub-division of an Integration package, dealing with a specific type of observable aspect of the service or product being observed. For example, the `mysql` package defines a data stream for collecting metrics and another data stream for collecting server logs.
2323

2424
A data stream defines all the assets needed to create an Elasticsearch data stream, for example: index templates and ingest pipelines. These assets are loaded into Elasticsearch when a user installs a package via the Fleet UI in Kibana.
2525

@@ -37,13 +37,13 @@ The data stream consists of:
3737

3838
The `_dev` directory is part of [the package spec](https://github.com/elastic/package-spec), containing development resources. These development resources cover any types of files/folders needed only at development time. This includes resources needed for testing but also includes any templates that might be used for generating documentation. In the future it could include other files/folders needed just at development time. It can be defined on the following levels:
3939

40-
1. the package-level `_dev` folder contains files needed to setup the testing environment for that package. This environment setup is specified via folders/files in the `_dev/deploy` folder. For example, the `apache` package [specifies](https://github.com/elastic/integrations/tree/master/packages/apache/_dev/deploy) how to spin up an Apache Docker container for testing.
41-
1. the data stream-level `_dev` folder contains test configuration files for various types of tests. For example, see the [`_dev/test` folder](https://github.com/elastic/integrations/tree/master/packages/apache/data_stream/error/_dev/test) under the `apache/error` data stream.
40+
1. the package-level `_dev` folder contains files needed to setup the testing environment for that package. This environment setup is specified via folders/files in the `_dev/deploy` folder. For example, the `apache` package [specifies](https://github.com/elastic/integrations/tree/main/packages/apache/_dev/deploy) how to spin up an Apache Docker container for testing.
41+
1. the data stream-level `_dev` folder contains test configuration files for various types of tests. For example, see the [`_dev/test` folder](https://github.com/elastic/integrations/tree/main/packages/apache/data_stream/error/_dev/test) under the `apache/error` data stream.
4242

4343
The integrations have also [asset](https://github.com/elastic/elastic-package/blob/master/docs/howto/asset_testing.md) and [static](https://github.com/elastic/elastic-package/blob/master/docs/howto/static_testing.md) tests. They don't require config files, but configs can be used to mark them as optional.
4444

4545
## Migration from Beats Modules
4646

47-
Filebeat and Metricbeat modules can be migrated over to Elastic Integrations. When migrating over, the same module in Filebeat and Metricbeat, related to the same observed product, can be combined into a single Elastic Integration.
47+
Filebeat and Metricbeat modules can be migrated over to Elastic Integrations. When migrating over, the same module in Filebeat and Metricbeat, related to the same observed product, can be combined into a single Elastic Integration.
4848

4949
[Learn more](/docs/import_from_beats.md) about how to migrate Filebeat and Metricbeat modules to Elastic Integrations.

‎docs/developer_workflow_design_build_test_integration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Feel free to merge the PR once you receive an approval from the Integrations tea
127127

128128
### Remember to bump up the version
129129

130-
When the PR is merged, the CI will kick off a build job for the master branch, which can release your integration to
130+
When the PR is merged, the CI will kick off a build job for the main branch, which can release your integration to
131131
the package-storage. It means that it will open a PR to the [Package Storage/snapshot](https://github.com/elastic/package-storage/tree/snapshot/packages) with
132132
the built integration if only the package version doesn't already exist in the storage (hasn't been released yet).
133133

0 commit comments

Comments
 (0)