From 445b93930f060c8ab19834e9199f861373d7c167 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Mon, 24 Aug 2020 12:17:10 -0400 Subject: [PATCH] Renamed package to stanza (#100) * Renamed package to stanza --- .circleci/config.yml | 24 +- .dockerignore | 4 +- .github/ISSUE_TEMPLATE.md | 2 +- CHANGELOG.md | 53 +-- CONTRIBUTING.md | 16 +- Dockerfile | 20 +- Makefile | 4 +- README.md | 56 +-- agent/agent.go | 10 +- agent/agent_test.go | 2 +- agent/config.go | 4 +- commands/default_paths.go | 2 +- commands/example_test.go | 2 +- commands/graph.go | 6 +- commands/graph_test.go | 2 +- commands/offsets.go | 6 +- commands/offsets_test.go | 4 +- commands/root.go | 8 +- commands/service.go | 18 +- commands/version.go | 4 +- docs/README.md | 4 +- docs/development.md | 4 +- docs/faq.md | 2 +- docs/operators/k8s_event_input.md | 12 +- docs/plugins.md | 6 +- docs/proxy.md | 6 +- docs/types/field.md | 2 +- docs/types/severity.md | 2 +- examples/k8s/daemonset.yaml | 28 +- examples/k8s/openshift.yaml | 28 +- go.mod | 14 +- go.sum | 345 ++++++++++++++++++ internal/version/version.go | 4 +- main.go | 2 +- operator/buffer/buffer.go | 6 +- operator/buffer/buffer_test.go | 4 +- operator/buffer/memory_buffer.go | 2 +- operator/buffer/memory_buffer_test.go | 4 +- operator/builtin/builtin.go | 8 +- operator/builtin/input/file/file.go | 6 +- operator/builtin/input/file/file_test.go | 6 +- operator/builtin/input/file/read_to_end.go | 6 +- operator/builtin/input/generate.go | 6 +- operator/builtin/input/generate_test.go | 8 +- operator/builtin/input/input.go | 2 +- operator/builtin/input/input_windows.go | 2 +- operator/builtin/input/journald.go | 6 +- operator/builtin/input/journald_test.go | 6 +- operator/builtin/input/k8s_events.go | 6 +- operator/builtin/input/k8s_events_test.go | 6 +- operator/builtin/input/tcp.go | 4 +- operator/builtin/input/tcp_test.go | 6 +- operator/builtin/input/udp.go | 4 +- operator/builtin/input/udp_test.go | 6 +- operator/builtin/input/windows/operator.go | 4 +- operator/builtin/input/windows/xml.go | 2 +- operator/builtin/input/windows/xml_test.go | 2 +- operator/builtin/output/drop.go | 6 +- operator/builtin/output/drop_test.go | 2 +- operator/builtin/output/elastic.go | 10 +- operator/builtin/output/elastic_test.go | 2 +- operator/builtin/output/file.go | 6 +- operator/builtin/output/google_cloud.go | 14 +- operator/builtin/output/google_cloud_test.go | 6 +- operator/builtin/output/stdout.go | 6 +- operator/builtin/output/stdout_test.go | 6 +- operator/builtin/parser/json.go | 6 +- operator/builtin/parser/json_test.go | 8 +- operator/builtin/parser/regex.go | 8 +- operator/builtin/parser/regex_test.go | 8 +- operator/builtin/parser/severity.go | 8 +- operator/builtin/parser/severity_test.go | 8 +- operator/builtin/parser/syslog.go | 6 +- operator/builtin/parser/syslog_test.go | 6 +- operator/builtin/parser/time.go | 8 +- operator/builtin/parser/time_test.go | 8 +- operator/builtin/transformer/filter.go | 6 +- operator/builtin/transformer/filter_test.go | 6 +- operator/builtin/transformer/host_metadata.go | 8 +- .../builtin/transformer/host_metadata_test.go | 6 +- .../transformer/k8s_metadata_decorator.go | 8 +- .../k8s_metadata_decorator_test.go | 8 +- operator/builtin/transformer/metadata.go | 8 +- operator/builtin/transformer/metadata_test.go | 8 +- operator/builtin/transformer/noop.go | 6 +- operator/builtin/transformer/noop_test.go | 2 +- operator/builtin/transformer/rate_limit.go | 6 +- .../builtin/transformer/rate_limit_test.go | 6 +- operator/builtin/transformer/restructure.go | 8 +- .../builtin/transformer/restructure_test.go | 8 +- operator/builtin/transformer/router.go | 6 +- operator/builtin/transformer/router_test.go | 8 +- operator/helper/expr_string.go | 4 +- operator/helper/expr_string_test.go | 2 +- operator/helper/host_identifier.go | 4 +- operator/helper/host_identifier_test.go | 2 +- operator/helper/identifier.go | 2 +- operator/helper/identifier_test.go | 2 +- operator/helper/input.go | 6 +- operator/helper/input_test.go | 4 +- operator/helper/labeler.go | 2 +- operator/helper/labeler_test.go | 2 +- operator/helper/operator.go | 4 +- operator/helper/operator_test.go | 4 +- operator/helper/output.go | 4 +- operator/helper/output_test.go | 4 +- operator/helper/parser.go | 6 +- operator/helper/parser_test.go | 6 +- operator/helper/persister.go | 2 +- operator/helper/severity.go | 4 +- operator/helper/severity_builder.go | 4 +- operator/helper/time.go | 6 +- operator/helper/transformer.go | 6 +- operator/helper/transformer_test.go | 6 +- operator/helper/writer.go | 4 +- operator/helper/writer_test.go | 6 +- operator/operator.go | 2 +- operator/plugin.go | 2 +- operator/plugin_parameter.go | 2 +- pipeline/config.go | 6 +- pipeline/config_test.go | 8 +- pipeline/node.go | 2 +- pipeline/pipeline.go | 4 +- pipeline/pipeline_test.go | 4 +- scripts/unix-install.sh | 48 +-- scripts/windows-install.ps1 | 44 +-- testutil/mocks.go | 4 +- testutil/operator.go | 4 +- testutil/util.go | 2 +- 129 files changed, 815 insertions(+), 471 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff1ecc4f9..17a0b63d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,13 +41,13 @@ jobs: at: ./artifacts - run: name: Download Plugins Tarball - command: curl -fL https://github.com/observiq/carbon-plugins/releases/latest/download/carbon-plugins.tar.gz -o ./artifacts/carbon-plugins.tar.gz + command: curl -fL https://github.com/observiq/stanza-plugins/releases/latest/download/stanza-plugins.tar.gz -o ./artifacts/stanza-plugins.tar.gz - run: name: Download Plugins Zip - command: curl -fL https://github.com/observiq/carbon-plugins/releases/latest/download/carbon-plugins.zip -o ./artifacts/carbon-plugins.zip + command: curl -fL https://github.com/observiq/stanza-plugins/releases/latest/download/stanza-plugins.zip -o ./artifacts/stanza-plugins.zip - run: name: Download Version File - command: curl -fL https://github.com/observiq/carbon-plugins/releases/latest/download/version.json -o ./artifacts/version.json + command: curl -fL https://github.com/observiq/stanza-plugins/releases/latest/download/version.json -o ./artifacts/version.json - persist_to_workspace: root: ./artifacts paths: @@ -82,11 +82,11 @@ jobs: name: "Publish Release on Docker Hub" command: | docker_tag=$(echo ${CIRCLE_TAG} | cut -b2- ) - docker build -t observiq/carbon:${docker_tag} . + docker build -t observiq/stanza:${docker_tag} . docker login -u ${DOCKER_HUB_USER} -p ${DOCKER_HUB_TOKEN} - docker push observiq/carbon:${docker_tag} - docker tag observiq/carbon:${docker_tag} observiq/carbon:latest - docker push observiq/carbon:latest + docker push observiq/stanza:${docker_tag} + docker tag observiq/stanza:${docker_tag} observiq/stanza:latest + docker push observiq/stanza:latest test-linux: executor: golang @@ -177,8 +177,8 @@ jobs: name: Setup Workspace command: mkdir {bin,out,tmp} - run: - name: Build Carbon Agent - command: GOPROXY=direct go build -v -o ./bin/carbon ./ + name: Build Stanza Agent + command: GOPROXY=direct go build -v -o ./bin/stanza ./ - run: name: Build Log Bench command: GOPROXY=direct go get github.com/observiq/amazon-log-agent-benchmark-tool/cmd/logbench/ && @@ -214,7 +214,7 @@ jobs: - run: name: Setup VM Workspace command: gcloud compute ssh << parameters.instance >> --ssh-key-file=~/.ssh/key --ssh-flag="-o LogLevel=QUIET" -- 'mkdir -p ~/benchmark/out' && - gcloud compute scp --ssh-key-file=~/.ssh/key ./bin/carbon << parameters.instance >>:~/benchmark/ && + gcloud compute scp --ssh-key-file=~/.ssh/key ./bin/stanza << parameters.instance >>:~/benchmark/ && gcloud compute scp --ssh-key-file=~/.ssh/key ./bin/logbench << parameters.instance >>:~/benchmark/ && gcloud compute scp --ssh-key-file=~/.ssh/key ./.circleci/testdata/benchmark.yaml << parameters.instance >>:~/benchmark/config.yaml && gcloud compute ssh << parameters.instance >> --ssh-key-file=~/.ssh/key --ssh-flag="-o LogLevel=QUIET" -- 'chmod -R 777 ~/benchmark' @@ -228,7 +228,7 @@ jobs: gcloud compute ssh << parameters.instance >> --ssh-key-file=~/.ssh/key --ssh-flag="-o LogLevel=QUIET" -- \ '~/benchmark/logbench -log $(echo stream{1..<< parameters.files >>}.log | tr " " ,) \ -rate << parameters.rate >> -t << parameters.duration >> -r 30s -f 2s -out ~/benchmark/out/results.json \ - ~/benchmark/carbon --database ~/benchmark/logagent.db --config ~/benchmark/config.yaml --cpu_profile ~/benchmark/out/cpu.pprof --cpu_profile_duration 30s \ + ~/benchmark/stanza --database ~/benchmark/logagent.db --config ~/benchmark/config.yaml --cpu_profile ~/benchmark/out/cpu.pprof --cpu_profile_duration 30s \ --mem_profile ~/benchmark/out/mem.pprof --mem_profile_delay 10s > ~/benchmark/out/notes 2>&1' - unless: condition: << parameters.profile >> @@ -239,7 +239,7 @@ jobs: gcloud compute ssh << parameters.instance >> --ssh-key-file=~/.ssh/key --ssh-flag="-o LogLevel=QUIET" -- \ '~/benchmark/logbench -log $(echo stream{1..<< parameters.files >>}.log | tr " " ,) \ -rate << parameters.rate >> -t << parameters.duration >> -r 30s -f 2s -out ~/benchmark/out/results.json \ - ~/benchmark/carbon --database ~/benchmark/logagent.db --config ~/benchmark/config.yaml > ~/benchmark/out/notes 2>&1' + ~/benchmark/stanza --database ~/benchmark/logagent.db --config ~/benchmark/config.yaml > ~/benchmark/out/notes 2>&1' - run: name: Retrieve Results diff --git a/.dockerignore b/.dockerignore index e939e9cb0..ddd32d7ec 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ -artifacts/carbon_darwin_amd64 -artifacts/carbon_windows_amd64 +artifacts/stanza_darwin_amd64 +artifacts/stanza_windows_amd64 .git/ dev/ diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 2c8a51aa3..832796491 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,7 @@ # Description If reporting a bug, please fill out the following additional information: -- Version (`carbon version`): +- Version (`stanza version`): - OS version: - Config file: - Debug logs (use `--debug` flag): diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f2a7bb25..c454652d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,20 +4,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## [0.9.11] - 2020-08-24 ### Added - The 'filter' operator ### Changed +- Renamed project to `stanza` - Move `testutil` package out of `internal` ## [0.9.10] - 2020-08-20 ### Added -- The `Resource` field was added to Entry ([PR95](https://github.com/observIQ/carbon/pull/95)) -- The `Identifier` helper was created to assist with writing to `Resource` ([PR95](https://github.com/observIQ/carbon/pull/95)) +- The `Resource` field was added to Entry ([PR95](https://github.com/observIQ/stanza/pull/95)) +- The `Identifier` helper was created to assist with writing to `Resource` ([PR95](https://github.com/observIQ/stanza/pull/95)) ### Removed -- The `Tags` field was removed from Entry ([PR95](https://github.com/observIQ/carbon/pull/95)) +- The `Tags` field was removed from Entry ([PR95](https://github.com/observIQ/stanza/pull/95)) ### Changed - The `host_metadata` operator now writes to an entry's `Resource` field, instead of Labels @@ -25,22 +26,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The `metadata` operator embeds the `Identifier` helper and supports writing to `Resource` - Input operators embed the `Identifier` helper and support writing to `Resource` - The `k8s_event` operator now supports the `write_to`, `labels`, and `resource` configuration options -- Multiline for `file_input` now supports matching on new lines characters ([PR96](https://github.com/observIQ/carbon/pull/96)) +- Multiline for `file_input` now supports matching on new lines characters ([PR96](https://github.com/observIQ/stanza/pull/96)) ## [0.9.9] - 2020-08-14 ### Added -- Kubernetes events input operator ([PR88](https://github.com/observIQ/carbon/pull/88)) +- Kubernetes events input operator ([PR88](https://github.com/observIQ/stanza/pull/88)) ### Fixed - Small improvements to test stability -- Fallback to reflection to convert entries to Google Cloud log entries ([PR93](https://github.com/observIQ/carbon/pull/93)) +- Fallback to reflection to convert entries to Google Cloud log entries ([PR93](https://github.com/observIQ/stanza/pull/93)) ## [0.9.8] - 2020-08-12 ### Fixed -- Google Cloud Output failure when sent a field of type uint16 ([PR82](https://github.com/observIQ/carbon/pull/82)) +- Google Cloud Output failure when sent a field of type uint16 ([PR82](https://github.com/observIQ/stanza/pull/82)) ### Added -- Added a default function to plugin templates ([PR84](https://github.com/observIQ/carbon/pull/84)) -- Add a host metadata operator that adds hostname and IP to entries ([PR85](https://github.com/observIQ/carbon/pull/85)) -- Google Cloud Output option to enable gzip compression ([PR86](https://github.com/observIQ/carbon/pull/86)) +- Added a default function to plugin templates ([PR84](https://github.com/observIQ/stanza/pull/84)) +- Add a host metadata operator that adds hostname and IP to entries ([PR85](https://github.com/observIQ/stanza/pull/85)) +- Google Cloud Output option to enable gzip compression ([PR86](https://github.com/observIQ/stanza/pull/86)) ## [0.9.7] - 2020-08-05 ### Changed @@ -60,16 +61,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.9.5] - 2020-07-28 ### Added -- Configurable `timeout` parameter for the `k8s_metadata_decorator` ([PR54](https://github.com/observIQ/carbon/pull/54)) -- Journald operator now supports `start_at` parameter ([PR55](https://github.com/observIQ/carbon/pull/55)) +- Configurable `timeout` parameter for the `k8s_metadata_decorator` ([PR54](https://github.com/observIQ/stanza/pull/54)) +- Journald operator now supports `start_at` parameter ([PR55](https://github.com/observIQ/stanza/pull/55)) ### Changed -- Enhanced plugin parameter metadata structure, to support required/optional and default values ([PR59](https://github.com/observIQ/carbon/pull/59)) +- Enhanced plugin parameter metadata structure, to support required/optional and default values ([PR59](https://github.com/observIQ/stanza/pull/59)) ### Fixed -- Issue where multiple instances of `syslog_parser` would cause parsing errors ([PR61](https://github.com/observIQ/carbon/pull/61)) -- `short destination buffer` error now is handled by increasing encoding buffer size ([PR58](https://github.com/observIQ/carbon/pull/58)) -- Issue where omitting the output field in a plugin could result in errors ([PR56](https://github.com/observIQ/carbon/pull/56)) +- Issue where multiple instances of `syslog_parser` would cause parsing errors ([PR61](https://github.com/observIQ/stanza/pull/61)) +- `short destination buffer` error now is handled by increasing encoding buffer size ([PR58](https://github.com/observIQ/stanza/pull/58)) +- Issue where omitting the output field in a plugin could result in errors ([PR56](https://github.com/observIQ/stanza/pull/56)) ## [0.9.4] - 2020-07-21 - Allow omitting `id`, defaulting to plugin type if unique within namespace @@ -77,17 +78,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.9.3] - 2020-07-20 ### Added -- Support for multiple encodings in the file input plugin ([PR39](https://github.com/observIQ/carbon/pull/39)) -- Install scripts and docker image now include plugins from `carbon-plugins` repository ([PR45](https://github.com/observIQ/carbon/pull/45)) -- Publish image to dockerhub ([PR42](https://github.com/observIQ/carbon/pull/42)) -- Improved default configuration ([PR41](https://github.com/observIQ/carbon/pull/41)) -- Basic developer documentation ([PR43](https://github.com/observIQ/carbon/pull/43)) +- Support for multiple encodings in the file input plugin ([PR39](https://github.com/observIQ/stanza/pull/39)) +- Install scripts and docker image now include plugins from `stanza-plugins` repository ([PR45](https://github.com/observIQ/stanza/pull/45)) +- Publish image to dockerhub ([PR42](https://github.com/observIQ/stanza/pull/42)) +- Improved default configuration ([PR41](https://github.com/observIQ/stanza/pull/41)) +- Basic developer documentation ([PR43](https://github.com/observIQ/stanza/pull/43)) ### Fixed -- JournalD emits `map[string]interface{}` ([PR38](https://github.com/observIQ/carbon/pull/38)) +- JournalD emits `map[string]interface{}` ([PR38](https://github.com/observIQ/stanza/pull/38)) ## [0.9.2] - 2020-07-13 ### Added -- Link `carbon` into `/usr/local/bin` so it's available on most users' `PATH` ([PR28](https://github.com/observIQ/carbon/pull/28)) +- Link `stanza` into `/usr/local/bin` so it's available on most users' `PATH` ([PR28](https://github.com/observIQ/stanza/pull/28)) - New parameter `file_name_path` to the file input plugin for cases when just the file name is needed ### Changed - Renamed `path_field` to `file_path_field` in the file input plugin @@ -96,9 +97,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.9.1] - 2020-07-13 ### Added -- More specific warning and error messages for common configuration issues ([PR12](https://github.com/observIQ/carbon/pull/12),[PR13](https://github.com/observIQ/carbon/pull/13),[PR14](https://github.com/observIQ/carbon/pull/14)) +- More specific warning and error messages for common configuration issues ([PR12](https://github.com/observIQ/stanza/pull/12),[PR13](https://github.com/observIQ/stanza/pull/13),[PR14](https://github.com/observIQ/stanza/pull/14)) ### Fixed -- Writing from files being actively written to will sometimes read partial entries ([PR21](https://github.com/observIQ/carbon/pull/21)) +- Writing from files being actively written to will sometimes read partial entries ([PR21](https://github.com/observIQ/stanza/pull/21)) - Minor documentation omissions ## [0.9.0] - 2020-07-07 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bf88d316e..e1daf679f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,34 +1,34 @@ -# Contributing to Carbon +# Contributing to Stanza ## Development You can view and edit the source code by cloning this repository: ```bash -git clone https://github.com/observiq/carbon.git +git clone https://github.com/observiq/stanza.git ``` ## Pull Requests ### How to Send Pull Requests -Everyone is welcome to contribute code to `carbon` via +Everyone is welcome to contribute code to `stanza` via GitHub pull requests (PRs). To create a new PR, fork the project in GitHub and clone the upstream repo: ```sh -$ go get -d github.com/observiq/carbon +$ go get -d github.com/observiq/stanza ``` -This will put the project in `${GOPATH}/src/github.com/observiq/carbon`. You +This will put the project in `${GOPATH}/src/github.com/observiq/stanza`. You can alternatively use `git` directly with: ```sh -$ git clone https://github.com/observiq/carbon +$ git clone https://github.com/observiq/stanza ``` -This would put the project in the `carbon` directory in +This would put the project in the `stanza` directory in current working directory. Enter the newly created directory and add your fork as a new remote: @@ -49,7 +49,7 @@ $ git commit $ git push ``` -Open a pull request against the main `carbon` repo. +Open a pull request against the main `stanza` repo. ### How to Receive Comments diff --git a/Dockerfile b/Dockerfile index 957733fcd..73bea4cf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic -RUN mkdir -p /carbon_home -ENV CARBON_HOME=/carbon_home -RUN echo "pipeline:\n" >> /carbon_home/config.yaml +RUN mkdir -p /stanza_home +ENV STANZA_HOME=/stanza_home +RUN echo "pipeline:\n" >> /stanza_home/config.yaml RUN apt-get update && apt-get install -y systemd ca-certificates -COPY ./artifacts/carbon_linux_amd64 /carbon_home/carbon -COPY ./artifacts/carbon-plugins.tar.gz /tmp/carbon-plugins.tar.gz -RUN tar -zxvf /tmp/carbon-plugins.tar.gz -C /carbon_home/ -ENTRYPOINT /carbon_home/carbon \ - --config /carbon_home/config.yaml \ - --database /carbon_home/carbon.db \ - --plugin_dir /carbon_home/plugins +COPY ./artifacts/stanza_linux_amd64 /stanza_home/stanza +COPY ./artifacts/stanza-plugins.tar.gz /tmp/stanza-plugins.tar.gz +RUN tar -zxvf /tmp/stanza-plugins.tar.gz -C /stanza_home/ +ENTRYPOINT /stanza_home/stanza \ + --config /stanza_home/config.yaml \ + --database /stanza_home/stanza.db \ + --plugin_dir /stanza_home/plugins diff --git a/Makefile b/Makefile index 865024be3..08e7cf143 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ GOARCH=$(shell go env GOARCH) GIT_SHA=$(shell git rev-parse --short HEAD) -BUILD_INFO_IMPORT_PATH=github.com/observiq/carbon/internal/version +BUILD_INFO_IMPORT_PATH=github.com/observiq/stanza/internal/version BUILD_X1=-X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) ifdef VERSION BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) @@ -34,7 +34,7 @@ generate: .PHONY: build build: - CGO_ENABLED=0 go build -o ./artifacts/carbon_$(GOOS)_$(GOARCH) $(BUILD_INFO) . + CGO_ENABLED=0 go build -o ./artifacts/stanza_$(GOOS)_$(GOARCH) $(BUILD_INFO) . .PHONY: install install: diff --git a/README.md b/README.md index 43b4d3c63..8b4fff819 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# carbon -Carbon is a fast and lightweight log transport and processing agent. It's designed as a modern replacement for Fluentd, Fluent Bit, and Logstash. +# stanza +Stanza is a fast and lightweight log transport and processing agent. It's designed as a modern replacement for Fluentd, Fluent Bit, and Logstash. -[![](https://circleci.com/gh/observIQ/carbon.svg?style=shield&circle-token=980a514f9dc5a48ac2b8e61a4cdb7555ea5646ca)](https://app.circleci.com/pipelines/github/observIQ/carbon) -[![codecov](https://codecov.io/gh/observIQ/carbon/branch/master/graph/badge.svg?token=i50h3UFXLg)](https://codecov.io/gh/observIQ/carbon) -[![Go Report Card](https://goreportcard.com/badge/github.com/observIQ/carbon)](https://goreportcard.com/report/github.com/observIQ/carbon) +[![](https://circleci.com/gh/observIQ/stanza.svg?style=shield&circle-token=980a514f9dc5a48ac2b8e61a4cdb7555ea5646ca)](https://app.circleci.com/pipelines/github/observIQ/stanza) +[![codecov](https://codecov.io/gh/observIQ/stanza/branch/master/graph/badge.svg?token=i50h3UFXLg)](https://codecov.io/gh/observIQ/stanza) +[![Go Report Card](https://goreportcard.com/badge/github.com/observIQ/stanza)](https://goreportcard.com/report/github.com/observIQ/stanza) ## How do I install the agent? @@ -11,15 +11,15 @@ We recommend using our single-line installer provided with each release: ### Linux ```shell -sh -c "$(curl -fsSlL https://github.com/observiq/carbon/releases/latest/download/unix-install.sh)" unix-install.sh +sh -c "$(curl -fsSlL https://github.com/observiq/stanza/releases/latest/download/unix-install.sh)" unix-install.sh ``` ### macOS ```shell -sh -c "$(curl -fsSlL https://github.com/observiq/carbon/releases/latest/download/unix-install.sh)" unix-install.sh +sh -c "$(curl -fsSlL https://github.com/observiq/stanza/releases/latest/download/unix-install.sh)" unix-install.sh ``` ### Windows ```pwsh -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-Expression ((New-Object net.webclient).DownloadString('https://github.com/observiq/carbon/releases/latest/download/windows-install.ps1')); Log-Agent-Install +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-Expression ((New-Object net.webclient).DownloadString('https://github.com/observiq/stanza/releases/latest/download/windows-install.ps1')); Log-Agent-Install ``` ## How do I run the agent? @@ -29,22 +29,22 @@ If you installed the agent using the single-line installer above, it's already r ### Linux ```shell # systemd -systemctl start carbon -systemctl stop carbon +systemctl start stanza +systemctl stop stanza # sysv -service carbon start -service carbon stop +service stanza start +service stanza stop ``` ### macOS ```shell -launchctl start com.observiq.carbon -launchctl stop com.observiq.carbon +launchctl start com.observiq.stanza +launchctl stop com.observiq.stanza ``` ### Windows ```pwsh -Start-Service -Name "carbon" -Stop-Service -Name "carbon" +Start-Service -Name "stanza" +Stop-Service -Name "stanza" ``` ### Manual @@ -53,13 +53,13 @@ If you'd like to run the agent manually rather than as a service, you can do tha ```shell # Example Command -carbon +stanza # Supported flags: --config The location of the agent config file (default: ./config.yaml) --plugin_dir The location of the plugins directory (default: ./plugins) --database The location of the offsets database file. If this is not specified, offsets will not be maintained across agent restarts ---log_file The location of the agent log file. If not specified, carbon will log to `stderr` +--log_file The location of the agent log file. If not specified, stanza will log to `stderr` --debug Enables debug logging ``` @@ -68,30 +68,30 @@ A simple configuration file (config.yaml) is included in the installation. By de ```yaml pipeline: - # An example input that generates a single log entry when Carbon starts up. + # An example input that generates a single log entry when Stanza starts up. - type: generate_input count: 1 entry: - record: This is a sample log generated by Carbon + record: This is a sample log generated by Stanza ... # An example output that sends captured logs to stdout. - type: stdout ... ``` -The first step in configuring carbon is to setup your output. The sample configuration provides examples for sending data to the Elastic stack or Google Cloud Monitoring. Uncomment the destination of your choice and add in your own credentials and host. Restart the agent to generate another log line. +The first step in configuring stanza is to setup your output. The sample configuration provides examples for sending data to the Elastic stack or Google Cloud Monitoring. Uncomment the destination of your choice and add in your own credentials and host. Restart the agent to generate another log line. ```yaml ... pipeline: - # An example input that generates a single log entry when Carbon starts up. + # An example input that generates a single log entry when Stanza starts up. - type: generate_input count: 1 entry: - record: This is a sample log generated by Carbon + record: This is a sample log generated by Stanza # An example output that sends captured logs to elasticsearch. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/elastic_output.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/elastic_output.md - type: elastic_output addresses: - http://my_node_address:9200 @@ -99,20 +99,20 @@ pipeline: ... ``` -Once you've confirmed you're able to send a log entry, you'll want to connect carbon to a log file you're interested in monitoring. We've included a sample `file_input` configuration in the config file to use (carbon also provide options for UDP, TCP, syslog, and other input streams. They're available [here](./docs/README.md)). +Once you've confirmed you're able to send a log entry, you'll want to connect stanza to a log file you're interested in monitoring. We've included a sample `file_input` configuration in the config file to use (stanza also provide options for UDP, TCP, syslog, and other input streams. They're available [here](./docs/README.md)). ```yaml ... pipeline: ... # An example input that monitors the contents of a file. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/file_input.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/file_input.md - type: file_input include: - /sample/file/path ... # An example output that sends captured logs to elasticsearch. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/elastic_output.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/elastic_output.md - type: elastic_output addresses: - http://my_node_address:9200 @@ -120,7 +120,7 @@ pipeline: ... ``` -That's it! You should have logs streaming to Elasticsearch. From here you can explore all the options available within carbon! You can use existing plugins from our plugin repository or build your own custom pipelines. +That's it! You should have logs streaming to Elasticsearch. From here you can explore all the options available within stanza! You can use existing plugins from our plugin repository or build your own custom pipelines. To learn more about configuration, visit our [docs](./docs/README.md). diff --git a/agent/agent.go b/agent/agent.go index efb2c62c4..ee7d31905 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - _ "github.com/observiq/carbon/operator/builtin" // register operators - "github.com/observiq/carbon/pipeline" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + _ "github.com/observiq/stanza/operator/builtin" // register operators + "github.com/observiq/stanza/pipeline" "go.etcd.io/bbolt" "go.uber.org/zap" ) @@ -68,7 +68,7 @@ func OpenDatabase(file string) (operator.Database, error) { return bbolt.Open(file, 0666, options) } -// NewLogAgent creates a new carbon log agent. +// NewLogAgent creates a new stanza log agent. func NewLogAgent(cfg *Config, logger *zap.SugaredLogger, pluginDir, databaseFile string, buildParams map[string]interface{}) (*LogAgent, error) { database, err := OpenDatabase(databaseFile) if err != nil { diff --git a/agent/agent_test.go b/agent/agent_test.go index cd728da4c..f13b1f55f 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/agent/config.go b/agent/config.go index 06a5bd21a..fe2a549d0 100644 --- a/agent/config.go +++ b/agent/config.go @@ -5,11 +5,11 @@ import ( "io/ioutil" "path/filepath" - "github.com/observiq/carbon/pipeline" + "github.com/observiq/stanza/pipeline" yaml "gopkg.in/yaml.v2" ) -// Config is the configuration of the carbon log agent. +// Config is the configuration of the stanza log agent. type Config struct { Pipeline pipeline.Config `json:"pipeline" yaml:"pipeline"` } diff --git a/commands/default_paths.go b/commands/default_paths.go index 3d954395c..4e9b77f63 100644 --- a/commands/default_paths.go +++ b/commands/default_paths.go @@ -8,7 +8,7 @@ import ( "strings" ) -var agentName = "carbon" +var agentName = "stanza" func defaultPluginDir() string { if stat, err := os.Stat("./plugins"); err == nil { diff --git a/commands/example_test.go b/commands/example_test.go index 519daba1b..d050630cc 100644 --- a/commands/example_test.go +++ b/commands/example_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/observiq/carbon/operator/builtin/output" + "github.com/observiq/stanza/operator/builtin/output" "github.com/stretchr/testify/require" ) diff --git a/commands/graph.go b/commands/graph.go index 2cc68f952..62963bf9a 100644 --- a/commands/graph.go +++ b/commands/graph.go @@ -3,9 +3,9 @@ package commands import ( "os" - "github.com/observiq/carbon/agent" - "github.com/observiq/carbon/operator" - pg "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/agent" + "github.com/observiq/stanza/operator" + pg "github.com/observiq/stanza/operator" "github.com/spf13/cobra" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/commands/graph_test.go b/commands/graph_test.go index 09cc699ce..7fbf22a48 100644 --- a/commands/graph_test.go +++ b/commands/graph_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" ) diff --git a/commands/offsets.go b/commands/offsets.go index 3dc9d24a7..a919693a3 100644 --- a/commands/offsets.go +++ b/commands/offsets.go @@ -5,8 +5,8 @@ import ( "io" "os" - agent "github.com/observiq/carbon/agent" - "github.com/observiq/carbon/operator/helper" + agent "github.com/observiq/stanza/agent" + "github.com/observiq/stanza/operator/helper" "github.com/spf13/cobra" "go.etcd.io/bbolt" ) @@ -20,7 +20,7 @@ func NewOffsetsCmd(rootFlags *RootFlags) *cobra.Command { Short: "Manage input operator offsets", Args: cobra.NoArgs, Run: func(command *cobra.Command, args []string) { - stdout.Write([]byte("No offsets subcommand specified. See `carbon offsets help` for details\n")) + stdout.Write([]byte("No offsets subcommand specified. See `stanza offsets help` for details\n")) }, } diff --git a/commands/offsets_test.go b/commands/offsets_test.go index d848abc09..ae3add79a 100644 --- a/commands/offsets_test.go +++ b/commands/offsets_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - agent "github.com/observiq/carbon/agent" - "github.com/observiq/carbon/operator/helper" + agent "github.com/observiq/stanza/agent" + "github.com/observiq/stanza/operator/helper" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" ) diff --git a/commands/root.go b/commands/root.go index 972c6b84f..c8652d5c0 100644 --- a/commands/root.go +++ b/commands/root.go @@ -14,13 +14,13 @@ import ( "sync" "time" - agent "github.com/observiq/carbon/agent" + agent "github.com/observiq/stanza/agent" "github.com/spf13/cobra" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) -// RootFlags are the root level flags that be provided when invoking carbon from the command line +// RootFlags are the root level flags that be provided when invoking stanza from the command line type RootFlags struct { DatabaseFile string ConfigFiles []string @@ -40,7 +40,7 @@ func NewRootCmd() *cobra.Command { rootFlags := &RootFlags{} root := &cobra.Command{ - Use: "carbon [-c ./config.yaml]", + Use: "stanza [-c ./config.yaml]", Short: "A log parser and router", Long: "A log parser and router", Args: cobra.NoArgs, @@ -51,7 +51,7 @@ func NewRootCmd() *cobra.Command { rootFlagSet.StringVar(&rootFlags.LogFile, "log_file", "", "write logs to configured path rather than stderr") rootFlagSet.StringSliceVarP(&rootFlags.ConfigFiles, "config", "c", []string{defaultConfig()}, "path to a config file") rootFlagSet.StringVar(&rootFlags.PluginDir, "plugin_dir", defaultPluginDir(), "path to the plugin directory") - rootFlagSet.StringVar(&rootFlags.DatabaseFile, "database", "", "path to the carbon offset database") + rootFlagSet.StringVar(&rootFlags.DatabaseFile, "database", "", "path to the stanza offset database") rootFlagSet.BoolVar(&rootFlags.Debug, "debug", false, "debug logging") // Profiling flags diff --git a/commands/service.go b/commands/service.go index ee8a79cde..7ed168279 100644 --- a/commands/service.go +++ b/commands/service.go @@ -7,29 +7,29 @@ import ( "syscall" "github.com/kardianos/service" - "github.com/observiq/carbon/agent" + "github.com/observiq/stanza/agent" "go.uber.org/zap" ) -// AgentService is a service that runs the carbon agent. +// AgentService is a service that runs the stanza agent. type AgentService struct { cancel context.CancelFunc agent *agent.LogAgent } -// Start will start the carbon agent. +// Start will start the stanza agent. func (a *AgentService) Start(s service.Service) error { - a.agent.Info("Starting carbon agent") + a.agent.Info("Starting stanza agent") if err := a.agent.Start(); err != nil { - a.agent.Errorw("Failed to start carbon agent", zap.Any("error", err)) + a.agent.Errorw("Failed to start stanza agent", zap.Any("error", err)) a.cancel() } return nil } -// Stop will stop the carbon agent. +// Stop will stop the stanza agent. func (a *AgentService) Stop(s service.Service) error { - a.agent.Info("Stopping carbon agent") + a.agent.Info("Stopping stanza agent") a.agent.Stop() a.cancel() return nil @@ -39,8 +39,8 @@ func (a *AgentService) Stop(s service.Service) error { func newAgentService(ctx context.Context, agent *agent.LogAgent, cancel context.CancelFunc) (service.Service, error) { agentService := &AgentService{cancel, agent} config := &service.Config{ - Name: "carbon", - DisplayName: "Carbon Log Agent", + Name: "stanza", + DisplayName: "Stanza Log Agent", Description: "Monitors and processes log entries", Option: service.KeyValue{ "RunWait": func() { diff --git a/commands/version.go b/commands/version.go index 3866fbcf6..bca17fdf9 100644 --- a/commands/version.go +++ b/commands/version.go @@ -1,7 +1,7 @@ package commands import ( - "github.com/observiq/carbon/internal/version" + "github.com/observiq/stanza/internal/version" "github.com/spf13/cobra" ) @@ -10,7 +10,7 @@ func NewVersionCommand() *cobra.Command { return &cobra.Command{ Use: "version", Args: cobra.NoArgs, - Short: "Print the carbon version", + Short: "Print the stanza version", Run: func(_ *cobra.Command, _ []string) { println(version.GetVersion()) }, diff --git a/docs/README.md b/docs/README.md index af29abe60..222ee6f89 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ -# Carbon Log Agent Documentation +# Stanza Log Agent Documentation -This repo contains documentation for the Carbon Log Agent. +This repo contains documentation for the Stanza Log Agent. ## How do I configure the agent? The agent is configured using a YAML config file that is passed in using the `--config` flag. This file defines a collection of operators beneath a top-level `pipeline` key. Each operator possesses a `type` and `id` field. diff --git a/docs/development.md b/docs/development.md index 063910844..64cdbb514 100644 --- a/docs/development.md +++ b/docs/development.md @@ -6,8 +6,8 @@ Clone this repo into your Go workspace: ``` cd $GOPATH/src mkdir -p github.com/observiq && cd github.com/observiq -git clone git@github.com:observiq/carbon.git -cd $GOPATH/src/github.com/observiq/carbon +git clone git@github.com:observiq/stanza.git +cd $GOPATH/src/github.com/observiq/stanza ``` ## Building diff --git a/docs/faq.md b/docs/faq.md index 4761ef1c9..cbc0ed58f 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -1,6 +1,6 @@ # Frequently asked questions -## Does Carbon support HTTP proxies? +## Does Stanza support HTTP proxies? Yes. See [here](/docs/proxy.md) for details. diff --git a/docs/operators/k8s_event_input.md b/docs/operators/k8s_event_input.md index 4a5049402..7cbbb98c3 100644 --- a/docs/operators/k8s_event_input.md +++ b/docs/operators/k8s_event_input.md @@ -1,7 +1,7 @@ ## `k8s_event_input` operator The `k8s_event_input` operator generates logs from Kubernetes events. It does this by connecting to the -Kubernetes API, and currently requires that Carbon is running inside a Kubernetes cluster. +Kubernetes API, and currently requires that Stanza is running inside a Kubernetes cluster. ### Configuration Fields @@ -37,21 +37,21 @@ Output events: "firstTimestamp": "2020-08-13T16:43:57Z", "involvedObject": { "apiVersion": "v1", - "fieldPath": "spec.containers{carbon}", + "fieldPath": "spec.containers{stanza}", "kind": "Pod", - "name": "carbon-g6rzd", + "name": "stanza-g6rzd", "namespace": "default", "resourceVersion": "18292818", "uid": "47d965e6-4bb3-4c58-a089-1a8b16bf21b0" }, "lastTimestamp": "2020-08-13T16:43:57Z", - "message": "Pulling image \"observiq/carbon:dev\"", + "message": "Pulling image \"observiq/stanza:dev\"", "metadata": { "creationTimestamp": "2020-08-13T16:43:57Z", - "name": "carbon-g6rzd.162ae19292cebe25", + "name": "stanza-g6rzd.162ae19292cebe25", "namespace": "default", "resourceVersion": "29923", - "selfLink": "/api/v1/namespaces/default/events/carbon-g6rzd.162ae19292cebe25", + "selfLink": "/api/v1/namespaces/default/events/stanza-g6rzd.162ae19292cebe25", "uid": "d210b74b-5c58-473f-ac51-3e21f6f8e2d1" }, "reason": "Pulling", diff --git a/docs/plugins.md b/docs/plugins.md index f9a49c07a..3e0ae80ff 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -16,7 +16,7 @@ pipeline: regex: '(?P[^\s]+) - (?P[^\s]+) \[(?P[^\]]+)\] "(?P[A-Z]+) (?P[^\s]+)[^"]+" (?P\d+) (?P[^\s]+)' ``` -Once a plugin config has been defined, it can be used in the carbon config file with a `type` matching the filename of the plugin. +Once a plugin config has been defined, it can be used in the stanza config file with a `type` matching the filename of the plugin. `config.yaml`: ```yaml @@ -39,5 +39,5 @@ adding variables for `path` and `output`. Plugins use Go's [`text/template`](https://golang.org/pkg/text/template/) package for template rendering. All fields from the plugin configuration are available as variables in the templates except the `type` field. -For carbon to discover a plugin, it needs to be in the `plugins` directory. This can be customized with the -`--plugin_dir` argument. For a default installation, the plugin directory is located at `$CARBON_HOME/plugins`. +For stanza to discover a plugin, it needs to be in the `plugins` directory. This can be customized with the +`--plugin_dir` argument. For a default installation, the plugin directory is located at `$STANZA_HOME/plugins`. diff --git a/docs/proxy.md b/docs/proxy.md index 6e1dd5771..a28b790bc 100644 --- a/docs/proxy.md +++ b/docs/proxy.md @@ -1,16 +1,16 @@ # Connecting through a proxy -Carbon supports sending logs through a HTTP proxy. To enable this, set the environment variables HTTP_PROXY and HTTPS_PROXY to the address of your proxy server. +Stanza supports sending logs through a HTTP proxy. To enable this, set the environment variables HTTP_PROXY and HTTPS_PROXY to the address of your proxy server. For example: ```bash export HTTP_PROXY=http://user:password@myproxy:3128 export HTTPS_PROXY=http://user:password@myproxy:3128 -carbon -c ./config.yaml +stanza -c ./config.yaml ``` -To set this for the Carbon service on Linux, the service file can be modified with `systemctl edit --full carbon`, and add the following lines in the `[Service]` section. +To set this for the Stanza service on Linux, the service file can be modified with `systemctl edit --full stanza`, and add the following lines in the `[Service]` section. ```service Environment=HTTP_PROXY=http://user:password@myproxy:3128 diff --git a/docs/types/field.md b/docs/types/field.md index 98817ac46..57756fe76 100644 --- a/docs/types/field.md +++ b/docs/types/field.md @@ -1,6 +1,6 @@ ## Fields -_Fields_ are the primary way to tell carbon which values of an entry to use in its operators. +_Fields_ are the primary way to tell stanza which values of an entry to use in its operators. Most often, these will be things like fields to parse for a parser operator, or the field to write a new value to. Fields are `.`-delimited strings which allow you to select labels or records on the entry. Fields can currently be used to select labels or values on a record. To select a label, prefix your field with `$label.` such as with `$label.my_label`. For values on the record, use the prefix `$record.` such as `$record.my_value`. diff --git a/docs/types/severity.md b/docs/types/severity.md index 5d12983c8..20d469725 100644 --- a/docs/types/severity.md +++ b/docs/types/severity.md @@ -1,6 +1,6 @@ ## Severity Parsing -`carbon` uses a flexible severity parsing system based on the integers 0 to 100. Standard severities are provided at multiples of 10. +`stanza` uses a flexible severity parsing system based on the integers 0 to 100. Standard severities are provided at multiples of 10. This severity system allows each output operator to interpret the values 0 to 100 as appropriate for the corresponding backend. diff --git a/examples/k8s/daemonset.yaml b/examples/k8s/daemonset.yaml index 7b00c4f72..c4a8175a7 100644 --- a/examples/k8s/daemonset.yaml +++ b/examples/k8s/daemonset.yaml @@ -2,14 +2,14 @@ kind: ServiceAccount apiVersion: v1 metadata: - name: carbon-metadata + name: stanza-metadata namespace: default --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 # kubernetes versions before 1.8.0 should use rbac.authorization.k8s.io/v1beta1 metadata: - name: carbon-metadata + name: stanza-metadata namespace: default rules: - apiGroups: [""] @@ -21,19 +21,19 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: - name: carbon-metadata + name: stanza-metadata roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: carbon-metadata + name: stanza-metadata subjects: - kind: ServiceAccount - name: carbon-metadata + name: stanza-metadata namespace: default --- kind: ConfigMap metadata: - name: carbon-config + name: stanza-config namespace: default apiVersion: v1 data: @@ -57,21 +57,21 @@ data: apiVersion: apps/v1 kind: DaemonSet metadata: - name: carbon + name: stanza namespace: default spec: selector: matchLabels: - name: carbon + name: stanza template: metadata: labels: - name: carbon + name: stanza spec: - serviceAccountName: carbon-metadata + serviceAccountName: stanza-metadata containers: - - name: carbon - image: observiq/carbon:0.0.0-alpha.1 + - name: stanza + image: observiq/stanza:0.0.0-alpha.1 imagePullPolicy: Always resources: limits: @@ -81,7 +81,7 @@ spec: memory: "250Mi" cpu: 100m volumeMounts: - - mountPath: /carbon_home/config.yaml + - mountPath: /stanza_home/config.yaml name: config subPath: config.yaml - mountPath: /var/log @@ -99,4 +99,4 @@ spec: path: /var/lib/docker/containers - name: config configMap: - name: carbon-config + name: stanza-config diff --git a/examples/k8s/openshift.yaml b/examples/k8s/openshift.yaml index 7a64fc283..4848529dc 100644 --- a/examples/k8s/openshift.yaml +++ b/examples/k8s/openshift.yaml @@ -2,14 +2,14 @@ kind: ServiceAccount apiVersion: v1 metadata: - name: carbon-metadata + name: stanza-metadata namespace: default --- kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 # kubernetes versions before 1.8.0 should use rbac.authorization.k8s.io/v1beta1 metadata: - name: carbon-metadata + name: stanza-metadata namespace: default rules: - apiGroups: [""] @@ -21,19 +21,19 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: - name: carbon-metadata + name: stanza-metadata roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: carbon-metadata + name: stanza-metadata subjects: - kind: ServiceAccount - name: carbon-metadata + name: stanza-metadata namespace: default --- kind: ConfigMap metadata: - name: carbon-config + name: stanza-config namespace: default apiVersion: v1 data: @@ -48,21 +48,21 @@ data: apiVersion: apps/v1 kind: DaemonSet metadata: - name: carbon + name: stanza namespace: default spec: selector: matchLabels: - name: carbon + name: stanza template: metadata: labels: - name: carbon + name: stanza spec: - serviceAccountName: carbon-metadata + serviceAccountName: stanza-metadata containers: - - name: carbon - image: observiq/carbon:dev + - name: stanza + image: observiq/stanza:dev imagePullPolicy: Always resources: limits: @@ -72,7 +72,7 @@ spec: memory: "250Mi" cpu: 100m volumeMounts: - - mountPath: /carbon_home/config.yaml + - mountPath: /stanza_home/config.yaml name: config subPath: config.yaml - mountPath: /var/log @@ -90,4 +90,4 @@ spec: path: /var/lib/docker/containers - name: config configMap: - name: carbon-config + name: stanza-config diff --git a/go.mod b/go.mod index 8957d43ab..2fc976573 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/observiq/carbon +module github.com/observiq/stanza go 1.14 @@ -7,8 +7,8 @@ require ( github.com/antonmedv/expr v1.8.2 github.com/cenkalti/backoff/v4 v4.0.2 github.com/elastic/go-elasticsearch/v7 v7.7.0 - github.com/golang/protobuf v1.3.4 - github.com/google/go-cmp v0.3.1 // indirect + github.com/golang/protobuf v1.4.2 + github.com/golangci/golangci-lint v1.30.0 // indirect github.com/googleapis/gax-go v1.0.3 github.com/hashicorp/go-uuid v1.0.2 github.com/influxdata/go-syslog/v3 v3.0.0 // indirect @@ -19,22 +19,20 @@ require ( github.com/observiq/go-syslog/v3 v3.0.2 github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cobra v1.0.0 - github.com/stretchr/testify v1.5.1 + github.com/stretchr/testify v1.6.1 + github.com/vektra/mockery v1.1.2 // indirect go.etcd.io/bbolt v1.3.4 go.uber.org/zap v1.15.0 golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/net v0.0.0-20200301022130-244492dfa37a + golang.org/x/net v0.0.0-20200625001655-4c5254603344 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae golang.org/x/text v0.3.3 - golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97 // indirect gonum.org/v1/gonum v0.6.2 google.golang.org/api v0.20.0 google.golang.org/genproto v0.0.0-20200304201815-d429ff31ee6c google.golang.org/grpc v1.27.1 - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/yaml.v2 v2.3.0 - honnef.co/go/tools v0.0.1-2020.1.3 // indirect k8s.io/api v0.18.6 k8s.io/apimachinery v0.18.6 k8s.io/client-go v0.18.6 diff --git a/go.sum b/go.sum index 480869667..a31d2fde4 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,19 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.43.0 h1:banaiRPAM8kUVYneOSkhgcDsLzEvL25FinuiSZaH/2w= cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3 h1:AVXDdKsrtX33oR9fbCMu/+c1o8Ofjq6Ku/MInaLVg5Y= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/logging v1.0.0 h1:kaunpnoEh9L4hu6JUsBa8Y20LBfKnCuDhKUgdZp7oK8= cloud.google.com/go/logging v1.0.0/go.mod h1:V1cc3ogwobYzQq5f2R7DS/GvRIrI4FKj01Gs5glwAls= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= @@ -16,19 +27,33 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 h1:XTrzB+F8+SpRmbhAH8HLxhiiG6nYNwaBZjrFps1oWEk= +github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Mottl/ctimefmt v0.0.0-20190803144728-fd2ac23a585a/go.mod h1:eyj2WSIdoPMPs2eNTLpSmM6Nzqo4V80/d6jHpnJ1SAI= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= +github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/antonmedv/expr v1.8.2 h1:BfkVHGudYqq7jp3Ji33kTn+qZ9D19t/Mndg0ag/Ycq4= github.com/antonmedv/expr v1.8.2/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bombsimon/wsl/v3 v3.1.0 h1:E5SRssoBgtVFPcYWUOFJEcgaySgdtTNYzsSKDOY7ss8= +github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs= github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -36,14 +61,21 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/daixiang0/gci v0.0.0-20200727065011-66f1df783cb2 h1:3Lhhps85OdA8ezsEKu+IA1hE+DBTjt/fjd7xNCrHbVA= +github.com/daixiang0/gci v0.0.0-20200727065011-66f1df783cb2/go.mod h1:+AV8KmHTGxxwp/pY84TLQfFKp2vuKXXJVzF3kD/hfR4= github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denis-tingajkin/go-header v0.3.1 h1:ymEpSiFjeItCy1FOP+x0M2KdCELdEAHUsNa8F+hHc6w= +github.com/denis-tingajkin/go-header v0.3.1/go.mod h1:sq/2IxMhaZX+RRcgHfCRx/m0M5na0fBt4/CRe7Lrji0= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -55,22 +87,60 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-critic/go-critic v0.5.0 h1:Ic2p5UCl5fX/2WX2w8nroPpPhxRNsNTMlJzsu/uqwnM= +github.com/go-critic/go-critic v0.5.0/go.mod h1:4jeRh3ZAVnRYhuWdOEvwzVqLUpxMSoAT0xZ74JsTPlo= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= +github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= +github.com/go-toolsmith/astcopy v1.0.0 h1:OMgl1b1MEpjFQ1m5ztEO06rz5CUd3oBv9RF7+DyvdG8= +github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= +github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astequal v1.0.0 h1:4zxD8j3JRFNyLN46lodQuqz3xdKSrur7U/sr0SDS/gQ= +github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= +github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= +github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= +github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= +github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= +github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= +github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= +github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod h1:WoMrjiy4zvdS+Bg6z9jZH82QXwkcgCBX6nOfnmdaHks= +github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= +github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= +github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= +github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= +github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc= +github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= @@ -91,12 +161,52 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= +github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= +github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= +github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 h1:YYWNAGTKWhKpcLLt7aSj/odlKrSrelQwlovBpDuf19w= +github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod h1:DbHgvLiFKX1Sh2T1w8Q/h4NAI8MHIpzCdnBUDTXU3I0= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw= +github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= +github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3 h1:pe9JHs3cHHDQgOFXJJdYkK6fLz2PWyYtP4hthoCMvs8= +github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod h1:JXrF4TWy4tXYn62/9x8Wm/K/dm06p8tCKwFRDPZG/1o= +github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d h1:pXTK/gkVNs7Zyy7WKgLXmpQ5bHTrq5GDsp8R9Qs67g0= +github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod h1:ozx7R9SIwqmqf5pRP90DhR2Oay2UIjGuKheCBCNwAYU= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks= +github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= +github.com/golangci/golangci-lint v1.30.0 h1:UhdK5WbO0GBd7W+k2lOD7BEJH4Wsa7zKfw8m3/aEJGQ= +github.com/golangci/golangci-lint v1.30.0/go.mod h1:5t0i3wHlqQc9deBBvZsP+a/4xz7cfjV+zhp5U0Mzp14= +github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI= +github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= +github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= +github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= +github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770 h1:EL/O5HGrF7Jaq0yNhBLucz9hTuRzj2LdwGBOaENgxIk= +github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 h1:leSNB7iYzLYSSx3J/s5sVf4Drkc68W2wm4Ixh/mr0us= +github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod h1:tf5+bzsHdTM0bsB7+8mt0GUMvjCgwLpTapNZHU8AajI= +github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0 h1:HVfrLniijszjS1aiNg8JbBMO2+E1WIQ+j/gL4SQqGPg= +github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod h1:qOQCunEYvmd/TLamH+7LlVccLvUH5kZNhbCgTHoBbp4= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= +github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -104,6 +214,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v1.0.3 h1:9dMLqhaibYONnDRcnHdUs9P8Mw64jLlZTYlDe3leBtQ= github.com/googleapis/gax-go v1.0.3/go.mod h1:QyXYajJFdARxGzjwUfbDFIse7Spkw81SJ4LrBJXtlQ8= @@ -114,19 +225,42 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gookit/color v1.2.5/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= +github.com/gostaticanalysis/analysisutil v0.0.3 h1:iwp+5/UAyzQSFgQ4uR2sni99sJ8Eo9DEacKWM5pekIg= +github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -134,20 +268,31 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/go-syslog v1.0.1 h1:a/ARpnCDr/sX/hVH7dyQVi+COXlEzM4bNIoolOfw99Y= github.com/influxdata/go-syslog/v3 v3.0.0 h1:jichmjSZlYK0VMmlz+k4WeOQd7z745YLsvGMqwtYt4I= github.com/influxdata/go-syslog/v3 v3.0.0/go.mod h1:tulsOp+CecTAYC27u9miMgq21GqXRW6VdKbOG+QSP4Q= +github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk= +github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s= +github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 h1:jNYPNLe3d8smommaoQlK7LOA5ESyUJJ+Wf79ZtA7Vp4= +github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kardianos/service v1.0.0 h1:HgQS3mFfOlyntWX8Oke98JcJLqt1DBcHR4kxShpYef0= github.com/kardianos/service v1.0.0/go.mod h1:8CzDhVuCuugtsHyZoTvsOBuvonN/UDBvl0kH+BUxvbo= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.10.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.10.5/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= @@ -155,15 +300,46 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kyoh86/exportloopref v0.1.7 h1:u+iHuTbkbTS2D/JP7fCuZDo/t3rBVGo3Hf58Rc+lQVY= +github.com/kyoh86/exportloopref v0.1.7/go.mod h1:h1rDl2Kdj97+Kwh4gdz3ujE7XHmH51Q0lUiZ1z4NLj8= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= +github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb h1:RHba4YImhrUVQDHUCe2BNSOz4tVy2yGyXhvYDvxGgeE= +github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= @@ -174,9 +350,18 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaPw= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= +github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= +github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nishanths/exhaustive v0.0.0-20200708172631-8866003e3856 h1:W3KBC2LFyfgd+wNudlfgCCsTo4q97MeNWrfz8/wSdSc= +github.com/nishanths/exhaustive v0.0.0-20200708172631-8866003e3856/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/observiq/ctimefmt v1.0.0 h1:r7vTJ+Slkrt9fZ67mkf+mA6zAdR5nGIJRMTzkUyvilk= github.com/observiq/ctimefmt v1.0.0/go.mod h1:mxi62//WbSpG/roCO1c6MqZ7zQTvjVtYheqHN3eOjvc= github.com/observiq/go-syslog/v3 v3.0.1 h1:lillWZkfRqDAg1UvzDc6UeEsoLuT3fFnq+6FOf9UHW4= @@ -187,10 +372,19 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -198,6 +392,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -208,28 +403,63 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= +github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8 h1:DvnesvLtRPQOvaUbfXfh0tpMHg29by0H7F2U+QIkSu8= +github.com/quasilyte/go-ruleguard v0.1.2-0.20200318202121-b00d7a75d3d8/go.mod h1:CGFX09Ci3pq9QZdj86B+VGIdNj4VyCo2iPOGS9esB/k= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= +github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.1.0 h1:DWbye9KyMgytn8uYpuHkwf0RHqAYO6Ay/D0TbCpPtVU= +github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM= +github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= +github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/securego/gosec/v2 v2.4.0 h1:ivAoWcY5DMs9n04Abc1VkqZBO0FL0h4ShTcVsC53lCE= +github.com/securego/gosec/v2 v2.4.0/go.mod h1:0/Q4cjmlFDfDUj1+Fib61sc+U5IQb2w+Iv9/C3wPVko= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= +github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= +github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= +github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= +github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= +github.com/sourcegraph/go-diff v0.5.3 h1:lhIKJ2nXLZZ+AfbHpYxTn0pXpNTTui0DX7DO3xeb1Zs= +github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/ssgreg/nlreturn/v2 v2.0.1 h1:+lm6xFjVuNw/9t/Fh5sIwfNWefiD5bddzc6vwJ1TvRI= +github.com/ssgreg/nlreturn/v2 v2.0.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -239,11 +469,37 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/tetafro/godot v0.4.8 h1:h61+hQraWhdI6WYqMwAwZYCE5yxL6a9/Orw4REbabSU= +github.com/tetafro/godot v0.4.8/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa h1:RC4maTWLKKwb7p1cnoygsbKIgNlJqSYBeAFON3Ar8As= +github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbdo= +github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= +github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= +github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= +github.com/uudashr/gocognit v1.0.1 h1:MoG2fZ0b/Eo7NXoIwCVFLG5JED3qgQz5/NEE+rOsjPs= +github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.12.0/go.mod h1:229t1eWu9UXTPmoUkbpN/fctKPBY4IJoFXQnxHGXy6E= +github.com/valyala/quicktemplate v1.5.1/go.mod h1:v7yYWpBEiutDyNfVaph6oC/yKwejzVyTX/2cwwHxyok= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4= +github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= @@ -262,6 +518,7 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -270,34 +527,47 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190221220918-438050ddec5e/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522 h1:OeRHuibLsmZkFj773W4LcfAGsSxJgfPONhr8cmO+eLA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -312,6 +582,10 @@ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= @@ -323,27 +597,41 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c h1:kISX68E8gSkNYAFRFiDU8rl5RIn1sJYKYb/r2vMLDrU= golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -362,25 +650,51 @@ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200321224714-0d839f3cf2ed/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97 h1:DAuln/hGp+aJiHpID1Y1hYzMEPP5WLwtZHPb50mN0OE= golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200519015757-0d0afa43d58a/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200701041122-1837592efa10/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305 h1:yaM5S0KcY0lIoZo7Fl+oi91b/DdlU2zuWpfHrpWbCS0= +golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= @@ -393,6 +707,9 @@ gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6d gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.20.0 h1:jz2KixHX7EcCPiQrySzPdnYT7DbINAypCqKZ1Z7GM40= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -407,7 +724,10 @@ google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200304201815-d429ff31ee6c h1:Mm69MraVZ+yh1vw8pQOUW4uJkkSEQbbTr076A94lvqs= google.golang.org/genproto v0.0.0-20200304201815-d429ff31ee6c/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= @@ -419,23 +739,36 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -444,6 +777,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.4 h1:8x49nBRxuXGUlDlwlWd3RMY1SayZrzFfxea3UZSkFw4= k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= k8s.io/api v0.18.6 h1:osqrAXbOQjkKIWDTjrqxWQ3w0GkKb1KA1XkUGHHYpeE= @@ -467,6 +802,14 @@ k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOEC k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f h1:gi7cb8HTDZ6q8VqsUpkdoFi3vxwHMneQ6+Q5Ap5hjPE= +mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= +mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= +mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= +mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f h1:Cq7MalBHYACRd6EesksG1Q8EoIAKOsiZviGKbOLIej4= +mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= @@ -475,3 +818,5 @@ sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnM sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 h1:JPJh2pk3+X4lXAkZIk2RuE/7/FoK9maXw+TNPJhVS/c= +sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= diff --git a/internal/version/version.go b/internal/version/version.go index 6ef8f78ca..1312fbde6 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -1,9 +1,9 @@ package version -// Version is the current version of the carbon library +// Version is the current version of the stanza library var Version string -// GitHash is the current git hash of the carbon library +// GitHash is the current git hash of the stanza library var GitHash string func GetVersion() string { diff --git a/main.go b/main.go index edfa6d572..2795dee97 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/observiq/carbon/commands" + "github.com/observiq/stanza/commands" ) func main() { diff --git a/operator/buffer/buffer.go b/operator/buffer/buffer.go index b4d2fa8fc..a5e945d32 100644 --- a/operator/buffer/buffer.go +++ b/operator/buffer/buffer.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" ) // Buffer is an entity that buffers log entries to an operator diff --git a/operator/buffer/buffer_test.go b/operator/buffer/buffer_test.go index 11cded7e1..eb8028888 100644 --- a/operator/buffer/buffer_test.go +++ b/operator/buffer/buffer_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" "github.com/stretchr/testify/require" "go.uber.org/zap" yaml "gopkg.in/yaml.v2" diff --git a/operator/buffer/memory_buffer.go b/operator/buffer/memory_buffer.go index ecf255b55..29d0a7656 100644 --- a/operator/buffer/memory_buffer.go +++ b/operator/buffer/memory_buffer.go @@ -7,7 +7,7 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "go.uber.org/zap" "google.golang.org/api/support/bundler" ) diff --git a/operator/buffer/memory_buffer_test.go b/operator/buffer/memory_buffer_test.go index 20e66f549..5f4194e63 100644 --- a/operator/buffer/memory_buffer_test.go +++ b/operator/buffer/memory_buffer_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest" diff --git a/operator/builtin/builtin.go b/operator/builtin/builtin.go index c52ad1286..04be0f8cd 100644 --- a/operator/builtin/builtin.go +++ b/operator/builtin/builtin.go @@ -2,8 +2,8 @@ package builtin import ( // Load embedded packages when importing builtin operators - _ "github.com/observiq/carbon/operator/builtin/input" - _ "github.com/observiq/carbon/operator/builtin/output" - _ "github.com/observiq/carbon/operator/builtin/parser" - _ "github.com/observiq/carbon/operator/builtin/transformer" + _ "github.com/observiq/stanza/operator/builtin/input" + _ "github.com/observiq/stanza/operator/builtin/output" + _ "github.com/observiq/stanza/operator/builtin/parser" + _ "github.com/observiq/stanza/operator/builtin/transformer" ) diff --git a/operator/builtin/input/file/file.go b/operator/builtin/input/file/file.go index 79ab4b1b0..3b0653576 100644 --- a/operator/builtin/input/file/file.go +++ b/operator/builtin/input/file/file.go @@ -15,9 +15,9 @@ import ( "sync" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" "golang.org/x/text/encoding" "golang.org/x/text/encoding/ianaindex" diff --git a/operator/builtin/input/file/file_test.go b/operator/builtin/input/file/file_test.go index d80f1a991..6bac6c827 100644 --- a/operator/builtin/input/file/file_test.go +++ b/operator/builtin/input/file/file_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/input/file/read_to_end.go b/operator/builtin/input/file/read_to_end.go index 5ea9ef378..b7bb7ad8e 100644 --- a/operator/builtin/input/file/read_to_end.go +++ b/operator/builtin/input/file/read_to_end.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" "golang.org/x/text/encoding" "golang.org/x/text/transform" diff --git a/operator/builtin/input/generate.go b/operator/builtin/input/generate.go index b85d36eac..9cc799f38 100644 --- a/operator/builtin/input/generate.go +++ b/operator/builtin/input/generate.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/input/generate_test.go b/operator/builtin/input/generate_test.go index 9d58b3b92..f3c7d6f86 100644 --- a/operator/builtin/input/generate_test.go +++ b/operator/builtin/input/generate_test.go @@ -5,10 +5,10 @@ import ( "text/template" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/input/input.go b/operator/builtin/input/input.go index a5fefbc07..cfb5fbfd6 100644 --- a/operator/builtin/input/input.go +++ b/operator/builtin/input/input.go @@ -2,5 +2,5 @@ package input import ( // Load packages when importing input operators - _ "github.com/observiq/carbon/operator/builtin/input/file" + _ "github.com/observiq/stanza/operator/builtin/input/file" ) diff --git a/operator/builtin/input/input_windows.go b/operator/builtin/input/input_windows.go index 61691497d..0f6722eca 100644 --- a/operator/builtin/input/input_windows.go +++ b/operator/builtin/input/input_windows.go @@ -2,5 +2,5 @@ package input import ( // Load windows only packages when importing input operators - _ "github.com/observiq/carbon/operator/builtin/input/windows" + _ "github.com/observiq/stanza/operator/builtin/input/windows" ) diff --git a/operator/builtin/input/journald.go b/operator/builtin/input/journald.go index 16ec912c5..57342a5b0 100644 --- a/operator/builtin/input/journald.go +++ b/operator/builtin/input/journald.go @@ -14,9 +14,9 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" ) diff --git a/operator/builtin/input/journald_test.go b/operator/builtin/input/journald_test.go index 44d2e21a9..3523484e4 100644 --- a/operator/builtin/input/journald_test.go +++ b/operator/builtin/input/journald_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/input/k8s_events.go b/operator/builtin/input/k8s_events.go index 9c285ddea..52d0fa135 100644 --- a/operator/builtin/input/k8s_events.go +++ b/operator/builtin/input/k8s_events.go @@ -7,9 +7,9 @@ import ( "time" backoff "github.com/cenkalti/backoff/v4" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/builtin/input/k8s_events_test.go b/operator/builtin/input/k8s_events_test.go index b46b8428a..b592615a0 100644 --- a/operator/builtin/input/k8s_events_test.go +++ b/operator/builtin/input/k8s_events_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/builtin/input/tcp.go b/operator/builtin/input/tcp.go index cf7f76abd..b7da58306 100644 --- a/operator/builtin/input/tcp.go +++ b/operator/builtin/input/tcp.go @@ -7,8 +7,8 @@ import ( "net" "sync" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" ) diff --git a/operator/builtin/input/tcp_test.go b/operator/builtin/input/tcp_test.go index 46a17bc11..fd6b10818 100644 --- a/operator/builtin/input/tcp_test.go +++ b/operator/builtin/input/tcp_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/input/udp.go b/operator/builtin/input/udp.go index 873d955e1..ec2080720 100644 --- a/operator/builtin/input/udp.go +++ b/operator/builtin/input/udp.go @@ -6,8 +6,8 @@ import ( "net" "sync" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" ) diff --git a/operator/builtin/input/udp_test.go b/operator/builtin/input/udp_test.go index a8560cd9c..a090c51e3 100644 --- a/operator/builtin/input/udp_test.go +++ b/operator/builtin/input/udp_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/input/windows/operator.go b/operator/builtin/input/windows/operator.go index 5463797f2..69926f22a 100644 --- a/operator/builtin/input/windows/operator.go +++ b/operator/builtin/input/windows/operator.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/input/windows/xml.go b/operator/builtin/input/windows/xml.go index b33baf59b..ac2281ede 100644 --- a/operator/builtin/input/windows/xml.go +++ b/operator/builtin/input/windows/xml.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" ) // EventXML is the rendered xml of an event. diff --git a/operator/builtin/input/windows/xml_test.go b/operator/builtin/input/windows/xml_test.go index 12decb324..5df2bf069 100644 --- a/operator/builtin/input/windows/xml_test.go +++ b/operator/builtin/input/windows/xml_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/output/drop.go b/operator/builtin/output/drop.go index 51ce22983..194496e0f 100644 --- a/operator/builtin/output/drop.go +++ b/operator/builtin/output/drop.go @@ -3,9 +3,9 @@ package output import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/output/drop_test.go b/operator/builtin/output/drop_test.go index 0c3a125ac..87ccbaea6 100644 --- a/operator/builtin/output/drop_test.go +++ b/operator/builtin/output/drop_test.go @@ -1,7 +1,7 @@ package output import ( - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/operator/helper" ) func newFakeNullOutput() *DropOutput { diff --git a/operator/builtin/output/elastic.go b/operator/builtin/output/elastic.go index 91e8a21d1..76da7992f 100644 --- a/operator/builtin/output/elastic.go +++ b/operator/builtin/output/elastic.go @@ -9,11 +9,11 @@ import ( elasticsearch "github.com/elastic/go-elasticsearch/v7" "github.com/elastic/go-elasticsearch/v7/esapi" uuid "github.com/hashicorp/go-uuid" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/buffer" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/buffer" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" ) diff --git a/operator/builtin/output/elastic_test.go b/operator/builtin/output/elastic_test.go index a16a8133f..5c385c798 100644 --- a/operator/builtin/output/elastic_test.go +++ b/operator/builtin/output/elastic_test.go @@ -3,7 +3,7 @@ package output import ( "testing" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/output/file.go b/operator/builtin/output/file.go index 13ad7ce2d..6c3d55dd7 100644 --- a/operator/builtin/output/file.go +++ b/operator/builtin/output/file.go @@ -8,9 +8,9 @@ import ( "os" "sync" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/output/google_cloud.go b/operator/builtin/output/google_cloud.go index 27f65088e..a7efe45a2 100644 --- a/operator/builtin/output/google_cloud.go +++ b/operator/builtin/output/google_cloud.go @@ -11,12 +11,12 @@ import ( vkit "cloud.google.com/go/logging/apiv2" "github.com/golang/protobuf/ptypes" structpb "github.com/golang/protobuf/ptypes/struct" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/internal/version" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/buffer" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/internal/version" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/buffer" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" "golang.org/x/oauth2/google" "google.golang.org/api/option" @@ -142,7 +142,7 @@ func (p *GoogleCloudOutput) Start() error { options := make([]option.ClientOption, 0, 2) options = append(options, option.WithCredentials(credentials)) - options = append(options, option.WithUserAgent("CarbonLogAgent/"+version.GetVersion())) + options = append(options, option.WithUserAgent("StanzaLogAgent/"+version.GetVersion())) if p.useCompression { options = append(options, option.WithGRPCDialOption(grpc.WithDefaultCallOptions(grpc.UseCompressor(gzip.Name)))) } diff --git a/operator/builtin/output/google_cloud_test.go b/operator/builtin/output/google_cloud_test.go index a46c2a7ef..8b4b75d56 100644 --- a/operator/builtin/output/google_cloud_test.go +++ b/operator/builtin/output/google_cloud_test.go @@ -12,9 +12,9 @@ import ( vkit "cloud.google.com/go/logging/apiv2" "github.com/golang/protobuf/ptypes" tspb "github.com/golang/protobuf/ptypes/timestamp" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" "google.golang.org/api/option" "google.golang.org/genproto/googleapis/api/monitoredres" diff --git a/operator/builtin/output/stdout.go b/operator/builtin/output/stdout.go index 537e850e2..2af1846b8 100644 --- a/operator/builtin/output/stdout.go +++ b/operator/builtin/output/stdout.go @@ -7,9 +7,9 @@ import ( "os" "sync" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) // Stdout is a global handle to standard output diff --git a/operator/builtin/output/stdout_test.go b/operator/builtin/output/stdout_test.go index 8deed2826..a690ba5a3 100644 --- a/operator/builtin/output/stdout_test.go +++ b/operator/builtin/output/stdout_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/parser/json.go b/operator/builtin/parser/json.go index 5cc4a028e..20d1f2ab0 100644 --- a/operator/builtin/parser/json.go +++ b/operator/builtin/parser/json.go @@ -5,9 +5,9 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/parser/json_test.go b/operator/builtin/parser/json_test.go index 43a70602f..bb462dc2f 100644 --- a/operator/builtin/parser/json_test.go +++ b/operator/builtin/parser/json_test.go @@ -6,10 +6,10 @@ import ( "time" jsoniter "github.com/json-iterator/go" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/operator/builtin/parser/regex.go b/operator/builtin/parser/regex.go index 8e41a3e4d..a2cd65e14 100644 --- a/operator/builtin/parser/regex.go +++ b/operator/builtin/parser/regex.go @@ -5,10 +5,10 @@ import ( "fmt" "regexp" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/parser/regex_test.go b/operator/builtin/parser/regex_test.go index d0951ddb7..12a17869f 100644 --- a/operator/builtin/parser/regex_test.go +++ b/operator/builtin/parser/regex_test.go @@ -5,10 +5,10 @@ import ( "regexp" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/parser/severity.go b/operator/builtin/parser/severity.go index 28c701a6a..68b17d818 100644 --- a/operator/builtin/parser/severity.go +++ b/operator/builtin/parser/severity.go @@ -3,10 +3,10 @@ package parser import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/parser/severity_test.go b/operator/builtin/parser/severity_test.go index f62833ba7..ea2cf2596 100644 --- a/operator/builtin/parser/severity_test.go +++ b/operator/builtin/parser/severity_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/parser/syslog.go b/operator/builtin/parser/syslog.go index d6d36178f..05b43c410 100644 --- a/operator/builtin/parser/syslog.go +++ b/operator/builtin/parser/syslog.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" syslog "github.com/observiq/go-syslog/v3" "github.com/observiq/go-syslog/v3/rfc3164" "github.com/observiq/go-syslog/v3/rfc5424" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/parser/syslog_test.go b/operator/builtin/parser/syslog_test.go index 25f65a48f..85e4d3c90 100644 --- a/operator/builtin/parser/syslog_test.go +++ b/operator/builtin/parser/syslog_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/parser/time.go b/operator/builtin/parser/time.go index 9776f9af2..320ee2117 100644 --- a/operator/builtin/parser/time.go +++ b/operator/builtin/parser/time.go @@ -3,10 +3,10 @@ package parser import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/parser/time_test.go b/operator/builtin/parser/time_test.go index 97744d7a1..63293a221 100644 --- a/operator/builtin/parser/time_test.go +++ b/operator/builtin/parser/time_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/filter.go b/operator/builtin/transformer/filter.go index c7fbf999d..435bd220b 100644 --- a/operator/builtin/transformer/filter.go +++ b/operator/builtin/transformer/filter.go @@ -7,9 +7,9 @@ import ( "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" ) diff --git a/operator/builtin/transformer/filter_test.go b/operator/builtin/transformer/filter_test.go index cd08faeb9..5c79ab5d8 100644 --- a/operator/builtin/transformer/filter_test.go +++ b/operator/builtin/transformer/filter_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/host_metadata.go b/operator/builtin/transformer/host_metadata.go index 3d8349600..9f8d3c828 100644 --- a/operator/builtin/transformer/host_metadata.go +++ b/operator/builtin/transformer/host_metadata.go @@ -3,10 +3,10 @@ package transformer import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/transformer/host_metadata_test.go b/operator/builtin/transformer/host_metadata_test.go index 004555945..2930fead6 100644 --- a/operator/builtin/transformer/host_metadata_test.go +++ b/operator/builtin/transformer/host_metadata_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/k8s_metadata_decorator.go b/operator/builtin/transformer/k8s_metadata_decorator.go index 1725b0913..f1bb6c1c8 100644 --- a/operator/builtin/transformer/k8s_metadata_decorator.go +++ b/operator/builtin/transformer/k8s_metadata_decorator.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" diff --git a/operator/builtin/transformer/k8s_metadata_decorator_test.go b/operator/builtin/transformer/k8s_metadata_decorator_test.go index 89fc1527e..83a8f43f8 100644 --- a/operator/builtin/transformer/k8s_metadata_decorator_test.go +++ b/operator/builtin/transformer/k8s_metadata_decorator_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/metadata.go b/operator/builtin/transformer/metadata.go index 670a221ef..265058773 100644 --- a/operator/builtin/transformer/metadata.go +++ b/operator/builtin/transformer/metadata.go @@ -3,10 +3,10 @@ package transformer import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/transformer/metadata_test.go b/operator/builtin/transformer/metadata_test.go index 68fd8c1a2..80b244651 100644 --- a/operator/builtin/transformer/metadata_test.go +++ b/operator/builtin/transformer/metadata_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/noop.go b/operator/builtin/transformer/noop.go index 77e75322a..6145c6bc0 100644 --- a/operator/builtin/transformer/noop.go +++ b/operator/builtin/transformer/noop.go @@ -3,9 +3,9 @@ package transformer import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/transformer/noop_test.go b/operator/builtin/transformer/noop_test.go index 583c3bb88..80420d9cc 100644 --- a/operator/builtin/transformer/noop_test.go +++ b/operator/builtin/transformer/noop_test.go @@ -3,7 +3,7 @@ package transformer import ( "testing" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/rate_limit.go b/operator/builtin/transformer/rate_limit.go index 2e97dbde1..2c862deee 100644 --- a/operator/builtin/transformer/rate_limit.go +++ b/operator/builtin/transformer/rate_limit.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/transformer/rate_limit_test.go b/operator/builtin/transformer/rate_limit_test.go index 43adfa81b..016d13e03 100644 --- a/operator/builtin/transformer/rate_limit_test.go +++ b/operator/builtin/transformer/rate_limit_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/builtin/transformer/restructure.go b/operator/builtin/transformer/restructure.go index 2f1e847ca..f95dc770d 100644 --- a/operator/builtin/transformer/restructure.go +++ b/operator/builtin/transformer/restructure.go @@ -7,10 +7,10 @@ import ( "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" ) func init() { diff --git a/operator/builtin/transformer/restructure_test.go b/operator/builtin/transformer/restructure_test.go index 5f8a578c7..f2de1fe88 100644 --- a/operator/builtin/transformer/restructure_test.go +++ b/operator/builtin/transformer/restructure_test.go @@ -9,10 +9,10 @@ import ( "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/operator/builtin/transformer/router.go b/operator/builtin/transformer/router.go index cf2d98acf..04abc022c 100644 --- a/operator/builtin/transformer/router.go +++ b/operator/builtin/transformer/router.go @@ -6,9 +6,9 @@ import ( "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" "go.uber.org/zap" ) diff --git a/operator/builtin/transformer/router_test.go b/operator/builtin/transformer/router_test.go index c88251f0d..ab5607b95 100644 --- a/operator/builtin/transformer/router_test.go +++ b/operator/builtin/transformer/router_test.go @@ -5,10 +5,10 @@ import ( "os" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/expr_string.go b/operator/helper/expr_string.go index ad3acd814..a8bdd22c1 100644 --- a/operator/helper/expr_string.go +++ b/operator/helper/expr_string.go @@ -8,8 +8,8 @@ import ( "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" ) type ExprStringConfig string diff --git a/operator/helper/expr_string_test.go b/operator/helper/expr_string_test.go index 679c8e4c9..f1a48caa4 100644 --- a/operator/helper/expr_string_test.go +++ b/operator/helper/expr_string_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/host_identifier.go b/operator/helper/host_identifier.go index 39bbb1f21..ec45209bb 100644 --- a/operator/helper/host_identifier.go +++ b/operator/helper/host_identifier.go @@ -5,8 +5,8 @@ import ( "net" "os" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" ) // NewHostIdentifierConfig returns a HostIdentifierConfig with default values diff --git a/operator/helper/host_identifier_test.go b/operator/helper/host_identifier_test.go index 06cf0a585..d369653dc 100644 --- a/operator/helper/host_identifier_test.go +++ b/operator/helper/host_identifier_test.go @@ -3,7 +3,7 @@ package helper import ( "testing" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/identifier.go b/operator/helper/identifier.go index cc6e069a4..ddb8a6878 100644 --- a/operator/helper/identifier.go +++ b/operator/helper/identifier.go @@ -1,7 +1,7 @@ package helper import ( - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" ) // NewIdentifierConfig creates a new identifier config with default values diff --git a/operator/helper/identifier_test.go b/operator/helper/identifier_test.go index 3a4429ad2..f08840340 100644 --- a/operator/helper/identifier_test.go +++ b/operator/helper/identifier_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/input.go b/operator/helper/input.go index 5e44365dd..3973b535d 100644 --- a/operator/helper/input.go +++ b/operator/helper/input.go @@ -3,9 +3,9 @@ package helper import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" "go.uber.org/zap" ) diff --git a/operator/helper/input_test.go b/operator/helper/input_test.go index fc1ffc8e4..a56ba8c3a 100644 --- a/operator/helper/input_test.go +++ b/operator/helper/input_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/labeler.go b/operator/helper/labeler.go index 1b33806ca..1e0a189fd 100644 --- a/operator/helper/labeler.go +++ b/operator/helper/labeler.go @@ -1,7 +1,7 @@ package helper import ( - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" ) // NewLabelerConfig creates a new labeler config with default values diff --git a/operator/helper/labeler_test.go b/operator/helper/labeler_test.go index 2223f56e2..89f913edb 100644 --- a/operator/helper/labeler_test.go +++ b/operator/helper/labeler_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/operator.go b/operator/helper/operator.go index bb1838719..af4a787e4 100644 --- a/operator/helper/operator.go +++ b/operator/helper/operator.go @@ -1,8 +1,8 @@ package helper import ( - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" "go.uber.org/zap" ) diff --git a/operator/helper/operator_test.go b/operator/helper/operator_test.go index d59c8d28e..efda49e93 100644 --- a/operator/helper/operator_test.go +++ b/operator/helper/operator_test.go @@ -3,8 +3,8 @@ package helper import ( "testing" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/operator/helper/output.go b/operator/helper/output.go index b76558f02..436e650b2 100644 --- a/operator/helper/output.go +++ b/operator/helper/output.go @@ -1,8 +1,8 @@ package helper import ( - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" ) func NewOutputConfig(operatorID, operatorType string) OutputConfig { diff --git a/operator/helper/output_test.go b/operator/helper/output_test.go index 1975cc4e4..b8d68b057 100644 --- a/operator/helper/output_test.go +++ b/operator/helper/output_test.go @@ -3,8 +3,8 @@ package helper import ( "testing" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/parser.go b/operator/helper/parser.go index 98dd1bc94..2cc9c40af 100644 --- a/operator/helper/parser.go +++ b/operator/helper/parser.go @@ -3,9 +3,9 @@ package helper import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" ) func NewParserConfig(operatorID, operatorType string) ParserConfig { diff --git a/operator/helper/parser_test.go b/operator/helper/parser_test.go index c3816c71a..198992671 100644 --- a/operator/helper/parser_test.go +++ b/operator/helper/parser_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/operator/helper/persister.go b/operator/helper/persister.go index fea266f72..ec7a096e7 100644 --- a/operator/helper/persister.go +++ b/operator/helper/persister.go @@ -3,7 +3,7 @@ package helper import ( "sync" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/operator" "go.etcd.io/bbolt" ) diff --git a/operator/helper/severity.go b/operator/helper/severity.go index 72b9ee909..603306d28 100644 --- a/operator/helper/severity.go +++ b/operator/helper/severity.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" ) // SeverityParser is a helper that parses severity onto an entry. diff --git a/operator/helper/severity_builder.go b/operator/helper/severity_builder.go index 295700183..9e4064963 100644 --- a/operator/helper/severity_builder.go +++ b/operator/helper/severity_builder.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" ) const minSeverity = 0 diff --git a/operator/helper/time.go b/operator/helper/time.go index 66f525745..49ff58aa2 100644 --- a/operator/helper/time.go +++ b/operator/helper/time.go @@ -9,9 +9,9 @@ import ( strptime "github.com/observiq/ctimefmt" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" ) // StrptimeKey is literally "strptime", and is the default layout type diff --git a/operator/helper/transformer.go b/operator/helper/transformer.go index df2b96fdf..da0eae9c4 100644 --- a/operator/helper/transformer.go +++ b/operator/helper/transformer.go @@ -3,9 +3,9 @@ package helper import ( "context" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" "go.uber.org/zap" ) diff --git a/operator/helper/transformer_test.go b/operator/helper/transformer_test.go index 8c17c0021..2bdefa17a 100644 --- a/operator/helper/transformer_test.go +++ b/operator/helper/transformer_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/operator/helper/writer.go b/operator/helper/writer.go index 2c3b8b5f6..11bd3941c 100644 --- a/operator/helper/writer.go +++ b/operator/helper/writer.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" ) func NewWriterConfig(operatorID, operatorType string) WriterConfig { diff --git a/operator/helper/writer_test.go b/operator/helper/writer_test.go index 38c6f1023..7c5a09b8d 100644 --- a/operator/helper/writer_test.go +++ b/operator/helper/writer_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" diff --git a/operator/operator.go b/operator/operator.go index c1ede8af1..11cf2e906 100644 --- a/operator/operator.go +++ b/operator/operator.go @@ -5,7 +5,7 @@ package operator import ( "context" - "github.com/observiq/carbon/entry" + "github.com/observiq/stanza/entry" "go.uber.org/zap" ) diff --git a/operator/plugin.go b/operator/plugin.go index 97a2a602f..ea14a73e9 100644 --- a/operator/plugin.go +++ b/operator/plugin.go @@ -8,7 +8,7 @@ import ( "strings" "text/template" - "github.com/observiq/carbon/errors" + "github.com/observiq/stanza/errors" yaml "gopkg.in/yaml.v2" ) diff --git a/operator/plugin_parameter.go b/operator/plugin_parameter.go index 4c7cec4bd..60f6e62cd 100644 --- a/operator/plugin_parameter.go +++ b/operator/plugin_parameter.go @@ -3,7 +3,7 @@ package operator import ( "fmt" - "github.com/observiq/carbon/errors" + "github.com/observiq/stanza/errors" ) // PluginParameter is a basic description of a plugin's parameter. diff --git a/pipeline/config.go b/pipeline/config.go index 4df6c6ca9..632c84c22 100644 --- a/pipeline/config.go +++ b/pipeline/config.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/operator/helper" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/operator/helper" yaml "gopkg.in/yaml.v2" ) diff --git a/pipeline/config_test.go b/pipeline/config_test.go index cadcdd327..4c94201fc 100644 --- a/pipeline/config_test.go +++ b/pipeline/config_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/observiq/carbon/operator" - _ "github.com/observiq/carbon/operator/builtin" - "github.com/observiq/carbon/operator/builtin/transformer" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/operator" + _ "github.com/observiq/stanza/operator/builtin" + "github.com/observiq/stanza/operator/builtin/transformer" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" ) diff --git a/pipeline/node.go b/pipeline/node.go index 316a0822e..b5b6f8435 100644 --- a/pipeline/node.go +++ b/pipeline/node.go @@ -3,7 +3,7 @@ package pipeline import ( "hash/fnv" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/operator" ) // OperatorNode is a basic node that represents an operator in a pipeline. diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 162444d26..c09fe6f21 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/observiq/carbon/errors" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/errors" + "github.com/observiq/stanza/operator" "gonum.org/v1/gonum/graph/encoding/dot" "gonum.org/v1/gonum/graph/simple" "gonum.org/v1/gonum/graph/topo" diff --git a/pipeline/pipeline_test.go b/pipeline/pipeline_test.go index d50c3c5ac..4c01f833b 100644 --- a/pipeline/pipeline_test.go +++ b/pipeline/pipeline_test.go @@ -3,8 +3,8 @@ package pipeline import ( "testing" - "github.com/observiq/carbon/operator" - "github.com/observiq/carbon/testutil" + "github.com/observiq/stanza/operator" + "github.com/observiq/stanza/testutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "gonum.org/v1/gonum/graph" diff --git a/scripts/unix-install.sh b/scripts/unix-install.sh index eb46e65ba..dc23a16c4 100755 --- a/scripts/unix-install.sh +++ b/scripts/unix-install.sh @@ -5,10 +5,10 @@ set -e # Agent Constants -SERVICE_NAME="carbon" -BINARY_NAME="carbon" -DOWNLOAD_BASE="https://github.com/observiq/carbon/releases" -PLUGINS_PACKAGE="carbon-plugins.tar.gz" +SERVICE_NAME="stanza" +BINARY_NAME="stanza" +DOWNLOAD_BASE="https://github.com/observiq/stanza/releases" +PLUGINS_PACKAGE="stanza-plugins.tar.gz" # Script Constants PREREQS="curl hostname printf ps sed uname cut tar" @@ -249,13 +249,13 @@ set_os() } # This will set the urls to use when downloading the agent and its plugins. -# These urls are constructed based on the --version flag or CARBON_VERSION env variable. +# These urls are constructed based on the --version flag or STANZA_VERSION env variable. # If not specified, the version defaults to "latest". set_download_urls() { if [ -z "$version" ] ; then # shellcheck disable=SC2153 - version=$CARBON_VERSION + version=$STANZA_VERSION fi if [ -z "$version" ] ; then @@ -268,13 +268,13 @@ set_download_urls() } # This will set the install directory of the agent. -# It is set by the --install-dir flag or CARBON_INSTALL_DIR env variable. +# It is set by the --install-dir flag or STANZA_INSTALL_DIR env variable. # If not specified, it defaults to an OS specific value. set_install_dir() { if [ -z "$install_dir" ]; then # shellcheck disable=SC2153 - install_dir=$CARBON_INSTALL_DIR + install_dir=$STANZA_INSTALL_DIR fi if [ -z "$install_dir" ]; then @@ -293,17 +293,17 @@ set_install_dir() # The install directory must be set prior to this. set_agent_home() { - agent_home="$install_dir/observiq/carbon" + agent_home="$install_dir/observiq/stanza" } # This will set the user assigned to the agent service. -# It is set by the --service-user flag or CARBON_SERVICE_USER env variable. +# It is set by the --service-user flag or STANZA_SERVICE_USER env variable. # If not specified, it defaults to root. set_service_user() { if [ -z "$service_user" ]; then # shellcheck disable=SC2153 - service_user=$CARBON_SERVICE_USER + service_user=$STANZA_SERVICE_USER fi if [ -z "$service_user" ] ; then @@ -401,10 +401,10 @@ dependencies_check() # extracting the binaries, and then removing the archive. install_package() { - banner "Installing Carbon" + banner "Installing Stanza" increase_indent - info "Creating Carbon directory..." + info "Creating Stanza directory..." mkdir -p "$agent_home" succeeded @@ -430,7 +430,7 @@ install_package() tar -zxf "$agent_home/tmp/plugins.tar.gz" -C "$agent_home" rm -fr "$agent_home/tmp" - success "Carbon installation complete!" + success "Stanza installation complete!" decrease_indent } @@ -459,15 +459,15 @@ create_config_file() cat << EOF > "$1" pipeline: - # An example input that generates a single log entry when Carbon starts up. + # An example input that generates a single log entry when Stanza starts up. - type: generate_input count: 1 entry: - record: This is a sample log generated by Carbon + record: This is a sample log generated by Stanza output: example_output # An example input that monitors the contents of a file. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/file_input.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/file_input.md # # - type: file_input # include: @@ -479,14 +479,14 @@ pipeline: type: stdout # An example output that sends captured logs to google cloud logging. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/google_cloud_output.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/google_cloud_output.md # # - id: example_output # type: google_cloud_output # credentials_file: /my/credentials/file # An example output that sends captured logs to elasticsearch. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/elastic_output.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/elastic_output.md # # - id: example_output # type: elastic_output @@ -728,9 +728,9 @@ create_sysv_file() { cat << "EOF" > "$1" #!/bin/sh -# carbon daemon +# stanza daemon # chkconfig: 2345 99 05 -# description: carbon log agent +# description: stanza log agent # processname: REPLACE_AGENT_BINARY # pidfile: /var/run/log-agent.pid @@ -920,7 +920,7 @@ create_systemd_file() { cat << EOF > "$1" [Unit] -Description=Carbon Log Agent +Description=Stanza Log Agent After=network.target [Service] @@ -989,8 +989,8 @@ display_results() { banner 'Information' increase_indent - info "Carbon Home: $(fg_cyan "$agent_home")$(reset)" - info "Carbon Config: $(fg_cyan "$agent_home/config.yaml")$(reset)" + info "Stanza Home: $(fg_cyan "$agent_home")$(reset)" + info "Stanza Config: $(fg_cyan "$agent_home/config.yaml")$(reset)" info "Start Command: $(fg_cyan "$startup_cmd")$(reset)" info "Stop Command: $(fg_cyan "$shutdown_cmd")$(reset)" decrease_indent diff --git a/scripts/windows-install.ps1 b/scripts/windows-install.ps1 index cf1c6ed91..0b4f870dd 100644 --- a/scripts/windows-install.ps1 +++ b/scripts/windows-install.ps1 @@ -3,8 +3,8 @@ new-module -name LogAgentInstall -scriptblock { # Constants $DEFAULT_WINDOW_TITLE = $host.ui.rawui.WindowTitle $DEFAULT_INSTALL_PATH = 'C:\' - $DOWNLOAD_BASE = "https://github.com/observiq/carbon/releases" - $SERVICE_NAME = 'carbon' + $DOWNLOAD_BASE = "https://github.com/observiq/stanza/releases" + $SERVICE_NAME = 'stanza' $INDENT_WIDTH = ' ' $MIN_DOT_NET_VERSION = '4.5' @@ -61,7 +61,7 @@ new-module -name LogAgentInstall -scriptblock { } function Set-Window-Title { - $host.ui.rawui.windowtitle = "Carbon Install" + $host.ui.rawui.windowtitle = "Stanza Install" } function Restore-Window-Title { @@ -288,12 +288,12 @@ new-module -name LogAgentInstall -scriptblock { Show-ColorText 'Configuring download urls...' Add-Indent if ( !$script:version ) { - $script:agent_download_url = "$DOWNLOAD_BASE/latest/download/carbon_windows_amd64" - $script:plugins_download_url = "$DOWNLOAD_BASE/latest/download/carbon-plugins.zip" + $script:agent_download_url = "$DOWNLOAD_BASE/latest/download/stanza_windows_amd64" + $script:plugins_download_url = "$DOWNLOAD_BASE/latest/download/stanza-plugins.zip" } else { - $script:agent_download_url = "$DOWNLOAD_BASE/download/$script:version/carbon_windows_amd64" - $script:plugins_download_url = "$DOWNLOAD_BASE/download/$script:version/carbon-plugins.zip" + $script:agent_download_url = "$DOWNLOAD_BASE/download/$script:version/stanza_windows_amd64" + $script:plugins_download_url = "$DOWNLOAD_BASE/download/$script:version/stanza-plugins.zip" } Show-ColorText "Using agent download url: " '' "$script:agent_download_url" DarkCyan Show-ColorText "Using plugins download url: " '' "$script:plugins_download_url" DarkCyan @@ -305,7 +305,7 @@ new-module -name LogAgentInstall -scriptblock { function Set-HomeDir { Show-ColorText 'Setting home directory...' Add-Indent - $script:agent_home = "{0}observiq\carbon" -f $script:install_dir + $script:agent_home = "{0}observiq\stanza" -f $script:install_dir If (-Not (Test-Path $script:agent_home) ) { New-Item -ItemType directory -Path $agent_home | Out-Null @@ -335,7 +335,7 @@ new-module -name LogAgentInstall -scriptblock { Show-ColorText 'Setting binary location...' Add-Indent - $script:binary_location = Get-AbsolutePath("$script:agent_home\carbon.exe") + $script:binary_location = Get-AbsolutePath("$script:agent_home\stanza.exe") Show-ColorText "Using binary location: " '' "$script:binary_location" DarkCyan Remove-Indent } @@ -406,8 +406,8 @@ new-module -name LogAgentInstall -scriptblock { } # This will download the agent binary to the binary location. - function Get-CarbonBinary { - Show-Header "Downloading Carbon Binary" + function Get-StanzaBinary { + Show-Header "Downloading Stanza Binary" Add-Indent Show-ColorText 'Downloading binary. Please wait...' Show-ColorText "$INDENT_WIDTH$script:agent_download_url" DarkCyan ' -> ' '' "$script:binary_location" DarkCyan @@ -425,8 +425,8 @@ new-module -name LogAgentInstall -scriptblock { } # This will download and extract plugins to the plugins directory. - function Get-CarbonPlugins { - Show-Header "Downloading Carbon Plugins" + function Get-StanzaPlugins { + Show-Header "Downloading Stanza Plugins" Add-Indent Show-ColorText 'Downloading plugins. Please wait...' Show-ColorText "$INDENT_WIDTH$script:plugins_download_url" DarkCyan ' -> ' '' "$script:agent_home\plugins.zip" DarkCyan @@ -536,15 +536,15 @@ new-module -name LogAgentInstall -scriptblock { @" pipeline: -# An example input that generates a single log entry when Carbon starts up. +# An example input that generates a single log entry when Stanza starts up. - type: generate_input count: 1 entry: - record: This is a sample log generated by Carbon + record: This is a sample log generated by Stanza output: example_output # An example input that monitors the contents of a file. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/file_input.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/file_input.md # # - # type: file_input # include: @@ -556,14 +556,14 @@ pipeline: type: stdout # An example output that sends captured logs to google cloud logging. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/google_cloud_output.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/google_cloud_output.md # # - id: example_output # type: google_cloud_output # credentials_file: /my/credentials/file # An example output that sends captured logs to elasticsearch. - # For more info: https://github.com/observIQ/carbon/blob/master/docs/operators/elastic_output.md + # For more info: https://github.com/observIQ/stanza/blob/master/docs/operators/elastic_output.md # # - id: example_output # type: elastic_output @@ -631,8 +631,8 @@ pipeline: function Show-AgentInfo { Show-Header 'Information' Add-Indent - Show-ColorText 'Carbon Home: ' '' "$script:agent_home" DarkCyan - Show-ColorText 'Carbon Config: ' '' "$script:agent_home\config.yaml" + Show-ColorText 'Stanza Home: ' '' "$script:agent_home" DarkCyan + Show-ColorText 'Stanza Config: ' '' "$script:agent_home\config.yaml" Show-ColorText 'Start On Boot: ' '' "$script:autostart" DarkCyan Show-ColorText 'Start Command: ' '' "$script:startup_cmd" DarkCyan Show-ColorText 'Stop Command: ' '' "$script:shutdown_cmd" DarkCyan @@ -690,8 +690,8 @@ pipeline: Set-InstallVariables Set-Permissions Remove-AgentService - Get-CarbonBinary - Get-CarbonPlugins + Get-StanzaBinary + Get-StanzaPlugins New-AgentConfig New-AgentService Complete-Install diff --git a/testutil/mocks.go b/testutil/mocks.go index cec297859..0edf8033e 100644 --- a/testutil/mocks.go +++ b/testutil/mocks.go @@ -4,8 +4,8 @@ import ( context "context" "testing" - entry "github.com/observiq/carbon/entry" - "github.com/observiq/carbon/operator" + entry "github.com/observiq/stanza/entry" + "github.com/observiq/stanza/operator" zap "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/testutil/operator.go b/testutil/operator.go index 9b3c321b2..4c2f490de 100644 --- a/testutil/operator.go +++ b/testutil/operator.go @@ -5,10 +5,10 @@ package testutil import ( context "context" - entry "github.com/observiq/carbon/entry" + entry "github.com/observiq/stanza/entry" mock "github.com/stretchr/testify/mock" - operator "github.com/observiq/carbon/operator" + operator "github.com/observiq/stanza/operator" zap "go.uber.org/zap" ) diff --git a/testutil/util.go b/testutil/util.go index 1172d8c6d..df6888c48 100644 --- a/testutil/util.go +++ b/testutil/util.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/observiq/carbon/operator" + "github.com/observiq/stanza/operator" "go.etcd.io/bbolt" "go.uber.org/zap/zaptest" )