Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into traefik-health-add-metric_type

Conflicts:
	packages/traefik/changelog.yml
	packages/traefik/manifest.yml
  • Loading branch information
harnish-elastic committed Sep 28, 2023
2 parents 13de6ec + e64d9b9 commit cca842c
Show file tree
Hide file tree
Showing 2,652 changed files with 66,715 additions and 32,250 deletions.
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pipeline {
ELASTIC_PACKAGE_REPOSITORY_LICENSE = "licenses/Elastic-2.0.txt"
}
options {
timeout(time: 4, unit: 'HOURS')
timeout(time: 6, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
timestamps()
ansiColor('xterm')
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
/packages/cisco_umbrella @elastic/security-external-integrations
/packages/citrix_adc @elastic/obs-infraobs-integrations
/packages/citrix_waf @elastic/security-external-integrations
/packages/cloud_defend @elastic/sec-cloudnative-integrations
/packages/cloud_defend @elastic/sec-linux-platform
/packages/cloud_security_posture @elastic/cloud-security-posture
/packages/cloudflare @elastic/security-external-integrations
/packages/cloudflare_logpush @elastic/security-external-integrations
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.1
1.21.1
216 changes: 118 additions & 98 deletions docs/developer_tsdb_migration_guidelines.md

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/elastic/integrations

go 1.19
go 1.21.0

require (
github.com/blang/semver v3.5.1+incompatible
github.com/elastic/elastic-package v0.86.1
github.com/elastic/elastic-package v0.87.1
github.com/elastic/go-licenser v0.4.1
github.com/elastic/package-registry v1.21.0
github.com/magefile/mage v1.15.0
Expand All @@ -30,7 +30,7 @@ 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-20230717121422-5aa5874ade95 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
github.com/ProtonMail/gopenpgp/v2 v2.7.3 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
Expand All @@ -53,10 +53,10 @@ 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.10.0 // indirect
github.com/elastic/package-spec/v2 v2.11.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
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
Expand Down Expand Up @@ -107,7 +107,7 @@ require (
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
Expand Down Expand Up @@ -136,15 +136,15 @@ require (
github.com/prometheus/procfs v0.10.1 // 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.7 // indirect
github.com/shirou/gopsutil/v3 v3.23.8 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down Expand Up @@ -183,11 +183,11 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.12.3 // indirect
howett.net/plist v1.0.0 // indirect
k8s.io/api v0.28.1 // indirect
k8s.io/api v0.28.2 // indirect
k8s.io/apiextensions-apiserver v0.27.3 // indirect
k8s.io/apimachinery v0.28.1 // indirect
k8s.io/cli-runtime v0.28.1 // indirect
k8s.io/client-go v0.28.1 // indirect
k8s.io/apimachinery v0.28.2 // indirect
k8s.io/cli-runtime v0.28.2 // indirect
k8s.io/client-go v0.28.2 // indirect
k8s.io/component-base v0.28.0 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
Expand Down
Loading

0 comments on commit cca842c

Please sign in to comment.