Skip to content

Commit

Permalink
Merge branch 'main' into suricata_missing_fields
Browse files Browse the repository at this point in the history
  • Loading branch information
MakoWish committed Aug 11, 2023
2 parents 41f6654 + 03533c0 commit 999ed3e
Show file tree
Hide file tree
Showing 350 changed files with 23,192 additions and 3,039 deletions.
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ pipeline {
AWS_ACCOUNT_SECRET = "secret/observability-team/ci/elastic-observability-aws-account-auth"
HOME = "${env.WORKSPACE}"
DOCKER_COMPOSE_VERSION = "v2.17.2"
KIND_VERSION = "v0.17.0"
K8S_VERSION = "v1.26.0"
KIND_VERSION = "v0.20.0"
K8S_VERSION = "v1.27.3"
JOB_GCS_BUCKET = 'fleet-ci-temp'
JOB_GCS_BUCKET_INTERNAL = 'fleet-ci-temp-internal'
JOB_GCS_CREDENTIALS = 'fleet-ci-gcs-plugin'
Expand Down
12 changes: 12 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
/packages/auditd_manager @elastic/security-external-integrations
/packages/auth0 @elastic/security-external-integrations
/packages/aws @elastic/obs-cloud-monitoring
/packages/aws/changelog.yml @elastic/obs-cloud-monitoring @elastic/security-external-integrations
/packages/aws/data_stream/guardduty @elastic/security-external-integrations
/packages/aws/data_stream/securityhub_findings @elastic/security-external-integrations
/packages/aws/data_stream/securityhub_insights @elastic/security-external-integrations
/packages/aws/kibana @elastic/obs-cloud-monitoring @elastic/kibana-visualizations
/packages/aws/manifest.yml @elastic/obs-cloud-monitoring @elastic/security-external-integrations
/packages/aws_logs @elastic/obs-cloud-monitoring
/packages/awsfargate @elastic/obs-cloud-monitoring
/packages/azure @elastic/obs-cloud-monitoring
Expand Down Expand Up @@ -98,6 +103,11 @@
/packages/fortinet_fortimail @elastic/security-external-integrations
/packages/fortinet_fortimanager @elastic/security-external-integrations
/packages/gcp @elastic/security-external-integrations @elastic/obs-cloud-monitoring
/packages/gcp/data_stream @elastic/obs-cloud-monitoring
/packages/gcp/data_stream/audit @elastic/security-external-integrations
/packages/gcp/data_stream/dns @elastic/security-external-integrations
/packages/gcp/data_stream/firewall @elastic/security-external-integrations
/packages/gcp/data_stream/vpcflow @elastic/security-external-integrations
/packages/gcp_metrics @elastic/obs-cloud-monitoring
/packages/gcp_pubsub @elastic/security-external-integrations
/packages/github @elastic/security-external-integrations
Expand Down Expand Up @@ -178,6 +188,7 @@
/packages/prometheus_input @elastic/obs-infraobs-integrations
/packages/proofpoint_tap @elastic/security-external-integrations
/packages/pulse_connect_secure @elastic/security-external-integrations
/packages/qualys_vmdr @elastic/security-external-integrations
/packages/qnap_nas @elastic/security-external-integrations
/packages/rabbitmq @elastic/obs-infraobs-integrations
/packages/radware @elastic/security-external-integrations
Expand Down Expand Up @@ -243,6 +254,7 @@
/packages/websphere_application_server @elastic/obs-infraobs-integrations
/packages/windows @elastic/elastic-agent-data-plane @elastic/security-external-integrations
/packages/windows/data_stream/applocker_exe_and_dll @elastic/security-external-integrations
/packages/windows/data_stream/applocker_msi_and_script @elastic/security-external-integrations
/packages/windows/data_stream/forwarded @elastic/security-external-integrations
/packages/windows/data_stream/perfmon @elastic/elastic-agent-data-plane
/packages/windows/data_stream/powershell @elastic/security-external-integrations
Expand Down
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.19

require (
github.com/blang/semver v3.5.1+incompatible
github.com/elastic/elastic-package v0.84.0
github.com/elastic/elastic-package v0.85.0
github.com/elastic/go-licenser v0.4.1
github.com/elastic/package-registry v1.20.0
github.com/magefile/mage v1.15.0
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
golang.org/x/tools v0.11.0
golang.org/x/tools v0.12.0
gopkg.in/yaml.v2 v2.4.0
)

Expand All @@ -30,9 +30,9 @@ require (
github.com/PaesslerAG/gval v1.2.1 // indirect
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
github.com/Pallinder/go-randomdata v1.2.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
github.com/ProtonMail/gopenpgp/v2 v2.7.1 // indirect
github.com/ProtonMail/gopenpgp/v2 v2.7.2 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
Expand All @@ -52,7 +52,7 @@ require (
github.com/elastic/go-ucfg v0.8.6 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gojsonschema v1.2.1 // indirect
github.com/elastic/package-spec/v2 v2.9.0 // indirect
github.com/elastic/package-spec/v2 v2.10.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
Expand Down Expand Up @@ -135,7 +135,7 @@ require (
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil/v3 v3.23.6 // indirect
github.com/shirou/gopsutil/v3 v3.23.7 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
Expand All @@ -162,14 +162,14 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.116.0 // indirect
Expand All @@ -179,13 +179,13 @@ require (
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.12.1 // indirect
helm.sh/helm/v3 v3.12.2 // indirect
howett.net/plist v1.0.0 // indirect
k8s.io/api v0.27.3 // indirect
k8s.io/api v0.27.4 // indirect
k8s.io/apiextensions-apiserver v0.27.2 // indirect
k8s.io/apimachinery v0.27.3 // indirect
k8s.io/cli-runtime v0.27.3 // indirect
k8s.io/client-go v0.27.3 // indirect
k8s.io/apimachinery v0.27.4 // indirect
k8s.io/cli-runtime v0.27.4 // indirect
k8s.io/client-go v0.27.4 // indirect
k8s.io/component-base v0.27.2 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
Expand Down
Loading

0 comments on commit 999ed3e

Please sign in to comment.