Skip to content

Commit a46bf56

Browse files
author
lucian-ioan
committed
Merge remote-tracking branch 'upstream/main' into azure_sanitize_ui
2 parents bfced9b + 4dedfd6 commit a46bf56

File tree

2,307 files changed

+80295
-72030
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,307 files changed

+80295
-72030
lines changed

‎.buildkite/pipeline.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
3+
steps:
4+
- label: "Example test"
5+
command: echo "Hello!"

‎.buildkite/pull-requests.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"jobs": [
3+
{
4+
"enabled": true,
5+
"pipelineSlug": "integrations",
6+
"allow_org_users": true,
7+
"allowed_repo_permissions": ["admin", "write"],
8+
"allowed_list": [ ],
9+
"set_commit_status": true,
10+
"build_on_commit": true,
11+
"build_on_comment": true,
12+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
13+
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
14+
"skip_ci_labels": [ ],
15+
"skip_target_branches": [ ],
16+
"skip_ci_on_only_changed": [ ],
17+
"always_require_ci_on_changed": [ ]
18+
}
19+
]
20+
}

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
/packages/symantec_endpoint @elastic/security-external-integrations
191191
/packages/synthetics @elastic/uptime
192192
/packages/sysmon_linux @elastic/security-external-integrations
193-
/packages/system @elastic/elastic-agent-data-plane
193+
/packages/system @elastic/obs-infraobs-integrations
194194
/packages/system/kibana @elastic/elastic-agent-data-plane @elastic/kibana-visualizations
195195
/packages/system_audit @elastic/security-external-integrations
196196
/packages/tanium @elastic/security-external-integrations

‎catalog-info.yaml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Declare a Backstage Component that represents your application.
2+
---
3+
# yaml-language-server: $schema=https://json.schemastore.org/catalog-info.json
4+
apiVersion: backstage.io/v1alpha1
5+
kind: Component
6+
metadata:
7+
name: integrations
8+
description: Elastic Integrations
9+
links:
10+
- title: Elastic Integrations Documentation
11+
icon: file-doc
12+
url: https://www.elastic.co/integrations/
13+
spec:
14+
type: library
15+
owner: group:ingest-fp
16+
system: platform-ingest
17+
lifecycle: production
18+
dependsOn:
19+
- "component:package-storage-infra"
20+
# TODO add a new dependsOn item for signing package job
21+
22+
---
23+
# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/e57ee3bed7a6f73077a3f55a38e76e40ec87a7cf/rre.schema.json
24+
apiVersion: backstage.io/v1alpha1
25+
kind: Resource
26+
metadata:
27+
name: buildkite-pipeline-integrations
28+
description: 'Pipeline for the Integrations project'
29+
links:
30+
- title: Pipeline
31+
url: https://buildkite.com/elastic/integrations
32+
33+
spec:
34+
type: buildkite-pipeline
35+
owner: group:ingest-fp
36+
system: buildkite
37+
implementation:
38+
apiVersion: buildkite.elastic.dev/v1
39+
kind: Pipeline
40+
metadata:
41+
name: integrations
42+
description: 'Pipeline for the Integrations project'
43+
spec:
44+
branch_configuration: "main backport-*"
45+
pipeline_file: ".buildkite/pipeline.yml"
46+
provider_settings:
47+
build_pull_request_forks: false
48+
build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
49+
build_tags: false
50+
filter_enabled: true
51+
filter_condition: >-
52+
build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
53+
repository: elastic/integrations
54+
cancel_intermediate_builds: true
55+
cancel_intermediate_builds_branch_filter: '!main'
56+
skip_intermediate_builds: true
57+
skip_intermediate_builds_branch_filter: '!main'
58+
env:
59+
ELASTIC_PR_COMMENTS_ENABLED: 'true'
60+
teams:
61+
ingest-fp:
62+
access_level: MANAGE_BUILD_AND_READ
63+
everyone:
64+
access_level: READ_ONLY

‎docs/developer_workflow_bug_fix_older_package_version.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ for Kibana version 7.x and bumped the AWS package version from 1.19.5 to 1.20.0.
88
a bug in the EC2 dashboard that needs to be fixed with Kibana version 7.x. So instead of
99
adding a new AWS package version 1.23.5, we need to fix it between 1.19.5 and 1.20.0.
1010

11-
Here there wil be detailed the steps to follow to release a fix for a given package version:
11+
Follow these detailed steps to release a fix for a given package version:
1212

1313
1. **Find git commit (package version) that needs to be fixed**
1414

‎docs/fine_tune_integration.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ what's been already fixed, as the script has overridden part of it).
129129
130130
Due to changed templating engine from a standard Golang one to [handlebars](https://handlebarsjs.com/), it may be
131131
hard to automatically convert the Filebeat input configuration (nested variables, many representations, conditions,
132-
loops). Kindly please to review the output stream configuration and review potential bugs.
132+
loops). Please review the output stream configuration and identify potential bugs.
133133
134134
11. Update docs template with sample events.
135135
136-
The events collected by the agent slightly differ from original, Metricbeat's and Filebeat's, ones. Adjust the event
136+
The events collected by the agent slightly differ from the original, Metricbeat and Filebeat, ones. Adjust the event
137137
content manually basing on already migrated integrations (e.g. [MySQL integration](https://github.com/elastic/integrations/blob/main/packages/mysql/_dev/build/docs/README.md))
138138
or copy them once managed to run whole setup with real agent.
139139

‎go.mod‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ go 1.19
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
7-
github.com/elastic/elastic-package v0.80.0
7+
github.com/elastic/elastic-package v0.82.0
88
github.com/elastic/go-licenser v0.4.1
99
github.com/elastic/package-registry v1.20.0
1010
github.com/magefile/mage v1.15.0
1111
github.com/pkg/errors v0.9.1
12-
github.com/stretchr/testify v1.8.3
13-
golang.org/x/tools v0.9.1
12+
github.com/stretchr/testify v1.8.4
13+
golang.org/x/tools v0.9.3
1414
gopkg.in/yaml.v2 v2.4.0
1515
)
1616

@@ -21,7 +21,7 @@ require (
2121
cloud.google.com/go/iam v0.13.0 // indirect
2222
cloud.google.com/go/pubsub v1.30.0 // indirect
2323
cloud.google.com/go/storage v1.30.1 // indirect
24-
github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
24+
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
2525
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2626
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2727
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -30,7 +30,7 @@ require (
3030
github.com/PaesslerAG/gval v1.2.1 // indirect
3131
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
3232
github.com/Pallinder/go-randomdata v1.2.0 // indirect
33-
github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310 // indirect
33+
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
3434
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
3535
github.com/ProtonMail/gopenpgp/v2 v2.7.1 // indirect
3636
github.com/andybalholm/brotli v1.0.4 // indirect
@@ -91,7 +91,7 @@ require (
9191
github.com/hashicorp/go-multierror v1.1.1 // indirect
9292
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
9393
github.com/huandu/xstrings v1.4.0 // indirect
94-
github.com/imdario/mergo v0.3.13 // indirect
94+
github.com/imdario/mergo v0.3.15 // indirect
9595
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9696
github.com/jcchavezs/porto v0.3.0 // indirect
9797
github.com/jedib0t/go-pretty v4.3.0+incompatible // indirect
@@ -135,8 +135,8 @@ require (
135135
github.com/prometheus/procfs v0.9.0 // indirect
136136
github.com/rivo/uniseg v0.4.3 // indirect
137137
github.com/russross/blackfriday/v2 v2.1.0 // indirect
138-
github.com/shirou/gopsutil/v3 v3.23.4 // indirect
139-
github.com/shoenig/go-m1cpu v0.1.5 // indirect
138+
github.com/shirou/gopsutil/v3 v3.23.5 // indirect
139+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
140140
github.com/shopspring/decimal v1.3.1 // indirect
141141
github.com/sirupsen/logrus v1.9.0 // indirect
142142
github.com/spf13/cast v1.5.0 // indirect
@@ -149,7 +149,7 @@ require (
149149
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
150150
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
151151
github.com/xlab/treeprint v1.1.0 // indirect
152-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
152+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
153153
go.elastic.co/apm/module/apmgorilla/v2 v2.4.1 // indirect
154154
go.elastic.co/apm/module/apmhttp/v2 v2.4.1 // indirect
155155
go.elastic.co/apm/module/apmzap/v2 v2.4.1 // indirect
@@ -162,7 +162,7 @@ require (
162162
go.uber.org/atomic v1.7.0 // indirect
163163
go.uber.org/multierr v1.10.0 // indirect
164164
go.uber.org/zap v1.24.0 // indirect
165-
golang.org/x/crypto v0.7.0 // indirect
165+
golang.org/x/crypto v0.9.0 // indirect
166166
golang.org/x/mod v0.10.0 // indirect
167167
golang.org/x/net v0.10.0 // indirect
168168
golang.org/x/oauth2 v0.6.0 // indirect
@@ -181,14 +181,14 @@ require (
181181
gopkg.in/yaml.v3 v3.0.1 // indirect
182182
helm.sh/helm/v3 v3.12.0 // indirect
183183
howett.net/plist v1.0.0 // indirect
184-
k8s.io/api v0.27.1 // indirect
184+
k8s.io/api v0.27.2 // indirect
185185
k8s.io/apiextensions-apiserver v0.27.1 // indirect
186-
k8s.io/apimachinery v0.27.1 // indirect
187-
k8s.io/cli-runtime v0.27.1 // indirect
188-
k8s.io/client-go v0.27.1 // indirect
186+
k8s.io/apimachinery v0.27.2 // indirect
187+
k8s.io/cli-runtime v0.27.2 // indirect
188+
k8s.io/client-go v0.27.2 // indirect
189189
k8s.io/component-base v0.27.1 // indirect
190190
k8s.io/klog/v2 v2.90.1 // indirect
191-
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
191+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
192192
k8s.io/kubectl v0.27.1 // indirect
193193
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
194194
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)