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

update go.mod to provide github.com/elastic/beats/v8 #31213

Closed
wants to merge 1 commit into from
Closed

update go.mod to provide github.com/elastic/beats/v8 #31213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ci/apm-beats-update.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def beatsUpdate() {
git config --global user.name "None"
git config --global --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*"

go mod edit -replace github.com/elastic/beats/v7=\${GOPATH}/src/github.com/elastic/beats-local
go mod edit -replace github.com/elastic/beats/v8=\${GOPATH}/src/github.com/elastic/beats-local
go mod tidy
echo '{"name": "${GOPATH}/src/github.com/elastic/beats-local", "licenceType": "Elastic"}' >> \${GOPATH}/src/github.com/elastic/beats-local/dev-tools/notice/overrides.json

Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/get-vendor-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ eval "$(gvm "${GO_VERSION}")"
go list -deps ./"${BEATS}" \
| grep 'elastic/beats' \
| sort \
| sed -e "s#github.com/elastic/beats/v7/##g" \
| sed -e "s#github.com/elastic/beats/v8/##g" \
| awk '{print "^" $1 "/.*"}'
16 changes: 8 additions & 8 deletions auditbeat/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/elastic/beats/v7/auditbeat/core"
"github.com/elastic/beats/v7/libbeat/cmd"
"github.com/elastic/beats/v7/libbeat/cmd/instance"
"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/libbeat/ecs"
"github.com/elastic/beats/v7/libbeat/publisher/processing"
"github.com/elastic/beats/v7/metricbeat/beater"
"github.com/elastic/beats/v7/metricbeat/mb/module"
"github.com/elastic/beats/v8/auditbeat/core"
"github.com/elastic/beats/v8/libbeat/cmd"
"github.com/elastic/beats/v8/libbeat/cmd/instance"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/beats/v8/libbeat/ecs"
"github.com/elastic/beats/v8/libbeat/publisher/processing"
"github.com/elastic/beats/v8/metricbeat/beater"
"github.com/elastic/beats/v8/metricbeat/mb/module"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/core/eventmod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package core

import (
"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/beats/v8/metricbeat/mb"
)

// AddDatasetToEvent adds dataset information to the event. In particular this
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/datastore/datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

bolt "go.etcd.io/bbolt"

"github.com/elastic/beats/v7/libbeat/paths"
"github.com/elastic/beats/v8/libbeat/paths"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/helper/hasher/hasher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"golang.org/x/crypto/sha3"
"golang.org/x/time/rate"

"github.com/elastic/beats/v7/libbeat/common/file"
"github.com/elastic/beats/v8/libbeat/common/file"
)

// HashType identifies a cryptographic algorithm.
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/include/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions auditbeat/include/list.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions auditbeat/magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ import (

"github.com/magefile/mage/mg"

auditbeat "github.com/elastic/beats/v7/auditbeat/scripts/mage"
devtools "github.com/elastic/beats/v7/dev-tools/mage"
"github.com/elastic/beats/v7/dev-tools/mage/target/build"
auditbeat "github.com/elastic/beats/v8/auditbeat/scripts/mage"
devtools "github.com/elastic/beats/v8/dev-tools/mage"
"github.com/elastic/beats/v8/dev-tools/mage/target/build"

// mage:import
"github.com/elastic/beats/v7/dev-tools/mage/target/common"
"github.com/elastic/beats/v8/dev-tools/mage/target/common"
// mage:import
"github.com/elastic/beats/v7/dev-tools/mage/target/unittest"
"github.com/elastic/beats/v8/dev-tools/mage/target/unittest"
// mage:import
"github.com/elastic/beats/v7/dev-tools/mage/target/integtest"
"github.com/elastic/beats/v8/dev-tools/mage/target/integtest"
// mage:import
_ "github.com/elastic/beats/v7/dev-tools/mage/target/test"
_ "github.com/elastic/beats/v8/dev-tools/mage/target/test"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ package main
import (
"os"

"github.com/elastic/beats/v7/auditbeat/cmd"
"github.com/elastic/beats/v8/auditbeat/cmd"

// Register includes.
_ "github.com/elastic/beats/v7/auditbeat/include"
_ "github.com/elastic/beats/v8/auditbeat/include"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"flag"
"testing"

"github.com/elastic/beats/v7/auditbeat/cmd"
"github.com/elastic/beats/v7/libbeat/tests/system/template"
"github.com/elastic/beats/v8/auditbeat/cmd"
"github.com/elastic/beats/v8/libbeat/tests/system/template"
)

var systemTest *bool
Expand Down
10 changes: 5 additions & 5 deletions auditbeat/module/auditd/audit_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"syscall"
"time"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/libbeat/monitoring"
"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v7/metricbeat/mb/parse"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/beats/v8/libbeat/logp"
"github.com/elastic/beats/v8/libbeat/monitoring"
"github.com/elastic/beats/v8/metricbeat/mb"
"github.com/elastic/beats/v8/metricbeat/mb/parse"
"github.com/elastic/go-libaudit/v2"
"github.com/elastic/go-libaudit/v2/aucoalesce"
"github.com/elastic/go-libaudit/v2/auparse"
Expand Down
12 changes: 6 additions & 6 deletions auditbeat/module/auditd/audit_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (

"github.com/prometheus/procfs"

"github.com/elastic/beats/v7/auditbeat/core"
"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/libbeat/mapping"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
"github.com/elastic/beats/v8/auditbeat/core"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/beats/v8/libbeat/logp"
"github.com/elastic/beats/v8/libbeat/mapping"
"github.com/elastic/beats/v8/metricbeat/mb"
mbtest "github.com/elastic/beats/v8/metricbeat/mb/testing"
"github.com/elastic/go-libaudit/v2"
"github.com/elastic/go-libaudit/v2/auparse"
)
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/module/auditd/audit_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ package auditd
import (
"fmt"

"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v7/metricbeat/mb/parse"
"github.com/elastic/beats/v8/metricbeat/mb"
"github.com/elastic/beats/v8/metricbeat/mb/parse"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/auditd/config_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v8/libbeat/common"
)

func TestConfigValidate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/auditd/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions auditbeat/module/auditd/golden_files_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
"github.com/elastic/go-libaudit/v2"
"github.com/elastic/go-libaudit/v2/aucoalesce"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/beats/v8/metricbeat/mb"
mbtest "github.com/elastic/beats/v8/metricbeat/mb/testing"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/auditd/show_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/elastic/go-libaudit/v2"
"github.com/elastic/go-libaudit/v2/rule"

"github.com/elastic/beats/v7/auditbeat/cmd"
"github.com/elastic/beats/v8/auditbeat/cmd"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"math/bits"
"strings"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v8/libbeat/common"
)

// Action is a description of the changes described by an event.
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/joeshaw/multierror"

"github.com/elastic/beats/v7/libbeat/common/match"
"github.com/elastic/beats/v8/libbeat/common/match"
)

// MaxValidFileSizeLimit is the largest possible value for `max_file_size`.
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/joeshaw/multierror"
"github.com/stretchr/testify/assert"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/go-ucfg"
)

Expand Down
6 changes: 3 additions & 3 deletions auditbeat/module/file_integrity/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ import (
"golang.org/x/crypto/blake2b"
"golang.org/x/crypto/sha3"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/libbeat/common/file"
"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v8/libbeat/common"
"github.com/elastic/beats/v8/libbeat/common/file"
"github.com/elastic/beats/v8/metricbeat/mb"
)

// Source identifies the source of an event (i.e. what triggered it).
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v8/libbeat/common"
)

var testEventTime = time.Now().UTC()
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/eventreader_fsevents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/fsnotify/fsevents"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v8/libbeat/logp"
)

type fsreader struct {
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/module/file_integrity/eventreader_fsnotify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (

"github.com/fsnotify/fsnotify"

"github.com/elastic/beats/v7/auditbeat/module/file_integrity/monitor"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v8/auditbeat/module/file_integrity/monitor"
"github.com/elastic/beats/v8/libbeat/logp"
)

type reader struct {
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/fileinfo_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/joeshaw/multierror"

"github.com/elastic/beats/v7/libbeat/common/file"
"github.com/elastic/beats/v8/libbeat/common/file"
)

// NewMetadata returns a new Metadata object. If an error is returned it is
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/flatbuffers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

flatbuffers "github.com/google/flatbuffers/go"

"github.com/elastic/beats/v7/auditbeat/module/file_integrity/schema"
"github.com/elastic/beats/v8/auditbeat/module/file_integrity/schema"
)

// Requires the Google flatbuffer compiler.
Expand Down
8 changes: 4 additions & 4 deletions auditbeat/module/file_integrity/metricset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (

bolt "go.etcd.io/bbolt"

"github.com/elastic/beats/v7/auditbeat/datastore"
"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v7/metricbeat/mb/parse"
"github.com/elastic/beats/v8/auditbeat/datastore"
"github.com/elastic/beats/v8/libbeat/logp"
"github.com/elastic/beats/v8/metricbeat/mb"
"github.com/elastic/beats/v8/metricbeat/mb/parse"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions auditbeat/module/file_integrity/metricset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import (

"github.com/stretchr/testify/assert"

"github.com/elastic/beats/v7/auditbeat/core"
"github.com/elastic/beats/v7/auditbeat/datastore"
abtest "github.com/elastic/beats/v7/auditbeat/testing"
"github.com/elastic/beats/v7/metricbeat/mb"
mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing"
"github.com/elastic/beats/v8/auditbeat/core"
"github.com/elastic/beats/v8/auditbeat/datastore"
abtest "github.com/elastic/beats/v8/auditbeat/testing"
"github.com/elastic/beats/v8/metricbeat/mb"
mbtest "github.com/elastic/beats/v8/metricbeat/mb/testing"
)

func TestData(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/mime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package file_integrity
import (
"github.com/h2non/filetype"

"github.com/elastic/beats/v7/libbeat/common/file"
"github.com/elastic/beats/v8/libbeat/common/file"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/monitor/recursive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/fsnotify/fsnotify"
"github.com/joeshaw/multierror"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v8/libbeat/logp"
)

type recursiveWatcher struct {
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"golang.org/x/time/rate"

"github.com/elastic/beats/v7/libbeat/logp"
"github.com/elastic/beats/v8/libbeat/logp"
)

// scannerID is used as a global monotonically increasing counter for assigning
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/scripts/mage/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"path/filepath"

devtools "github.com/elastic/beats/v7/dev-tools/mage"
devtools "github.com/elastic/beats/v8/dev-tools/mage"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/scripts/mage/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/magefile/mage/sh"

devtools "github.com/elastic/beats/v7/dev-tools/mage"
devtools "github.com/elastic/beats/v8/dev-tools/mage"
)

// ModuleDocs collects documentation from modules (both OSS and X-Pack).
Expand Down
Loading