From bf96fa1e34a608642727f4e2857ce8de4d7627f7 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Mon, 12 Oct 2020 13:07:11 +0200 Subject: [PATCH 1/3] Upgrade build-image from Debian stretch to buster Signed-off-by: Marco Pracucci --- .circleci/config.yml | 6 +++--- .github/workflows/test-build-deploy.yml | 12 ++++++------ build-image/Dockerfile | 4 ++-- docs/contributing/how-to-update-the-build-image.md | 3 ++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab6cc933c74..e37b1194b74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ defaults: &defaults docker: # IMPORTANT: whenever you change the build-image version tag, remember to replace it # across the entire file (there are multiple references). - - image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 + - image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP working_directory: /go/src/github.com/cortexproject/cortex filters: &filters @@ -87,7 +87,7 @@ jobs: test: docker: - - image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 + - image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP - image: cassandra:3.11 environment: JVM_OPTS: "-Xms1024M -Xmx1024M" @@ -111,7 +111,7 @@ jobs: name: Integration Test command: | touch build-image/.uptodate - MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 configs-integration-test + MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP configs-integration-test integration: machine: diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index b3f0d78457c..bbf0a4a6c94 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -9,10 +9,10 @@ jobs: lint: runs-on: ubuntu-latest container: - image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 + image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP steps: - name: Checkout Repo - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Sym Link Expected Path to Workspace run: | mkdir -p /go/src/github.com/cortexproject/cortex @@ -31,7 +31,7 @@ jobs: test: runs-on: ubuntu-latest container: - image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 + image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP services: cassandra: image: cassandra:3.11 @@ -41,7 +41,7 @@ jobs: - 9042:9042 steps: - name: Checkout Repo - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Sym Link Expected Path to Workspace run: | mkdir -p /go/src/github.com/cortexproject/cortex @@ -52,10 +52,10 @@ jobs: build: runs-on: ubuntu-latest container: - image: quay.io/cortexproject/build-image:update-golang-1.14.9-eb0c8d4d2 + image: quay.io/cortexproject/build-image:upgrade-build-image-debian-491e60715-WIP steps: - name: Checkout Repo - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Install Docker Client run: | set -x diff --git a/build-image/Dockerfile b/build-image/Dockerfile index fcd001d1d1c..054d080c54f 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.14.9-stretch +FROM golang:1.14.9-buster ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - -RUN apt-get install -y nodejs npm && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN apt-get install -y nodejs && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install website builder dependencies. Whenever you change these version, please also change website/package.json # and viceversa. diff --git a/docs/contributing/how-to-update-the-build-image.md b/docs/contributing/how-to-update-the-build-image.md index 697f74e761c..0cc1ab019da 100644 --- a/docs/contributing/how-to-update-the-build-image.md +++ b/docs/contributing/how-to-update-the-build-image.md @@ -11,4 +11,5 @@ The build image currently can only be updated by a Cortex maintainer. If you're 2. Build the image running `make build-image/.uptodate` 3. Publish the image to the repository running `docker push quay.io/cortexproject/build-image:TAG` (this can only be done by a maintainer) 4. Replace the image tag in `.circleci/config.yml` (_there may be multiple references_) -5. Open a PR and make sure the CI with new build-image passes +5. Replace the image tag in `.github/workflows/*` (_there may be multiple references_) +6. Open a PR and make sure the CI with new build-image passes From 9dbc6ae736759548d9a68e6ac4af96faeefb62b7 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Mon, 12 Oct 2020 14:03:25 +0200 Subject: [PATCH 2/3] Rebuilt protos Signed-off-by: Marco Pracucci --- pkg/chunk/purger/delete_plan.pb.go | 60 +++--- pkg/chunk/storage/caching_index_client.pb.go | 46 ++--- pkg/ingester/client/cortex.pb.go | 187 +++++++++---------- pkg/querier/queryrange/queryrange.pb.go | 126 ++++++------- 4 files changed, 209 insertions(+), 210 deletions(-) diff --git a/pkg/chunk/purger/delete_plan.pb.go b/pkg/chunk/purger/delete_plan.pb.go index ab1ef599ac6..336634b1c3e 100644 --- a/pkg/chunk/purger/delete_plan.pb.go +++ b/pkg/chunk/purger/delete_plan.pb.go @@ -126,7 +126,7 @@ func (m *ChunksGroup) GetChunks() []ChunkDetails { } type ChunkDetails struct { - ID string `protobuf:"bytes,1,opt,name=ID,json=iD,proto3" json:"ID,omitempty"` + ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` PartiallyDeletedInterval *Interval `protobuf:"bytes,2,opt,name=partially_deleted_interval,json=partiallyDeletedInterval,proto3" json:"partially_deleted_interval,omitempty"` } @@ -238,35 +238,35 @@ func init() { proto.RegisterFile("delete_plan.proto", fileDescriptor_c38868cf63b var fileDescriptor_c38868cf63b27372 = []byte{ // 454 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x31, 0x6f, 0xd4, 0x30, - 0x18, 0x8d, 0x53, 0x74, 0xa2, 0xbe, 0xa3, 0x6a, 0x8d, 0x04, 0xa7, 0x1b, 0xdc, 0xea, 0xa6, 0x1b, - 0x20, 0x91, 0x8a, 0x90, 0x18, 0x90, 0x80, 0xe3, 0x24, 0xa8, 0x04, 0x52, 0x89, 0x98, 0x58, 0x22, - 0x27, 0xf9, 0x48, 0x4d, 0x7d, 0xb1, 0xb1, 0x1d, 0x04, 0x1b, 0x1b, 0x2b, 0x3f, 0x83, 0xbf, 0xc0, - 0x3f, 0xe8, 0x78, 0x63, 0xc5, 0x50, 0x71, 0xb9, 0x85, 0xb1, 0x3f, 0x01, 0xc5, 0xc9, 0x5d, 0x03, - 0x12, 0x0b, 0x5b, 0xde, 0xf7, 0xde, 0xf7, 0xfc, 0xfc, 0x62, 0xbc, 0x97, 0x81, 0x00, 0x0b, 0xb1, - 0x12, 0xac, 0x08, 0x94, 0x96, 0x56, 0x92, 0x6d, 0x55, 0xea, 0x1c, 0xea, 0xc1, 0xe8, 0x6e, 0xce, - 0xed, 0x49, 0x99, 0x04, 0xa9, 0x9c, 0x87, 0xb9, 0xcc, 0x65, 0xe8, 0x14, 0x49, 0xf9, 0xd6, 0x21, - 0x07, 0xdc, 0x57, 0xb3, 0x39, 0x7a, 0xdc, 0x91, 0xa7, 0x52, 0x5b, 0xf8, 0xa8, 0xb4, 0x7c, 0x07, - 0xa9, 0x6d, 0x51, 0xa8, 0x4e, 0xf3, 0x90, 0x17, 0x39, 0x18, 0x0b, 0x3a, 0x4c, 0x05, 0x87, 0x62, - 0x4d, 0x35, 0x0e, 0xe3, 0x2f, 0x08, 0xe3, 0x99, 0x4b, 0x74, 0x2c, 0x58, 0x41, 0x1e, 0xe0, 0x1b, - 0x75, 0x8e, 0x98, 0x17, 0x16, 0xf4, 0x07, 0x26, 0x86, 0xe8, 0x00, 0x4d, 0xfa, 0x87, 0x37, 0x83, - 0x4d, 0xc4, 0xe0, 0xa8, 0xa5, 0xa2, 0x41, 0x0d, 0xd7, 0x88, 0x3c, 0xc2, 0x83, 0xf4, 0xa4, 0x2c, - 0x4e, 0x4d, 0x9c, 0x6b, 0x59, 0xaa, 0xa1, 0x7f, 0xb0, 0x35, 0xe9, 0x1f, 0xde, 0xea, 0x2c, 0x3e, - 0x75, 0xf4, 0xb3, 0x9a, 0x9d, 0x5e, 0x3b, 0xbb, 0xd8, 0xf7, 0xa2, 0x7e, 0x7a, 0x35, 0x1a, 0x7f, - 0x47, 0xb8, 0xdf, 0x91, 0x10, 0x83, 0x7b, 0x82, 0x25, 0x20, 0xcc, 0x10, 0x39, 0xab, 0xbd, 0xa0, - 0x0d, 0xfe, 0xa2, 0x9e, 0x1e, 0x33, 0xae, 0xa7, 0xcf, 0x6b, 0x97, 0x1f, 0x17, 0xfb, 0xff, 0x53, - 0x43, 0x63, 0xf3, 0x24, 0x63, 0xca, 0x82, 0x8e, 0xda, 0xa3, 0xc8, 0x7d, 0xdc, 0x6b, 0x32, 0xb5, - 0xf9, 0x6f, 0xff, 0x9d, 0x7f, 0x06, 0x96, 0x71, 0x61, 0xda, 0x0b, 0xb4, 0xe2, 0xf1, 0x7b, 0x3c, - 0xe8, 0xb2, 0x64, 0x07, 0xfb, 0x47, 0x33, 0xd7, 0xdd, 0x76, 0xe4, 0xf3, 0x19, 0x79, 0x85, 0x47, - 0x8a, 0x69, 0xcb, 0x99, 0x10, 0x9f, 0xe2, 0xe6, 0x01, 0x64, 0x57, 0x1d, 0xfb, 0xff, 0xee, 0x78, - 0xb8, 0x59, 0x6b, 0x7e, 0x52, 0xb6, 0x66, 0xc6, 0x09, 0xbe, 0xbe, 0xe9, 0xfe, 0x0e, 0x26, 0xc6, - 0x32, 0x6d, 0x63, 0xcb, 0xe7, 0x60, 0x2c, 0x9b, 0xab, 0x78, 0x6e, 0xdc, 0xf1, 0x5b, 0xd1, 0xae, - 0x63, 0x5e, 0xaf, 0x89, 0x97, 0x86, 0x4c, 0xf0, 0x2e, 0x14, 0xd9, 0x9f, 0x5a, 0xdf, 0x69, 0x77, - 0xa0, 0xc8, 0x3a, 0xca, 0xe9, 0xc3, 0xc5, 0x92, 0x7a, 0xe7, 0x4b, 0xea, 0x5d, 0x2e, 0x29, 0xfa, - 0x5c, 0x51, 0xf4, 0xad, 0xa2, 0xe8, 0xac, 0xa2, 0x68, 0x51, 0x51, 0xf4, 0xb3, 0xa2, 0xe8, 0x57, - 0x45, 0xbd, 0xcb, 0x8a, 0xa2, 0xaf, 0x2b, 0xea, 0x2d, 0x56, 0xd4, 0x3b, 0x5f, 0x51, 0xef, 0x4d, - 0xcf, 0xdd, 0x43, 0x27, 0x3d, 0xf7, 0xc2, 0xee, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xa1, - 0xa8, 0x2d, 0xf2, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x31, 0x6f, 0xd3, 0x40, + 0x18, 0xf5, 0xb9, 0x28, 0xa2, 0x97, 0x50, 0xb5, 0x87, 0x04, 0x51, 0x86, 0x6b, 0x95, 0x29, 0x03, + 0xd8, 0x52, 0x11, 0x12, 0x03, 0x12, 0x10, 0x22, 0x41, 0x24, 0x90, 0x8a, 0xc5, 0xc4, 0x62, 0x9d, + 0xed, 0x0f, 0xd7, 0xf4, 0xe2, 0x3b, 0xee, 0xce, 0x08, 0x36, 0x36, 0x56, 0x7e, 0x06, 0x7f, 0x81, + 0x7f, 0xd0, 0x31, 0x63, 0xc5, 0x50, 0x11, 0x67, 0x61, 0xec, 0x4f, 0x40, 0x3e, 0xdb, 0x89, 0x41, + 0x62, 0x61, 0xf3, 0xfb, 0xde, 0xfb, 0xde, 0xbd, 0x7b, 0x3e, 0x7c, 0x90, 0x00, 0x07, 0x03, 0xa1, + 0xe4, 0x2c, 0xf7, 0xa4, 0x12, 0x46, 0x90, 0x5d, 0x59, 0xa8, 0x14, 0xaa, 0xc1, 0xe8, 0x6e, 0x9a, + 0x99, 0xd3, 0x22, 0xf2, 0x62, 0xb1, 0xf0, 0x53, 0x91, 0x0a, 0xdf, 0x2a, 0xa2, 0xe2, 0xad, 0x45, + 0x16, 0xd8, 0xaf, 0x7a, 0x73, 0xf4, 0xb8, 0x23, 0x8f, 0x85, 0x32, 0xf0, 0x51, 0x2a, 0xf1, 0x0e, + 0x62, 0xd3, 0x20, 0x5f, 0x9e, 0xa5, 0x7e, 0x96, 0xa7, 0xa0, 0x0d, 0x28, 0x3f, 0xe6, 0x19, 0xe4, + 0x2d, 0x55, 0x3b, 0x8c, 0xbf, 0x20, 0x8c, 0x67, 0x36, 0xd1, 0x09, 0x67, 0x39, 0x79, 0x80, 0x6f, + 0x54, 0x39, 0xc2, 0x2c, 0x37, 0xa0, 0x3e, 0x30, 0x3e, 0x44, 0x47, 0x68, 0xd2, 0x3f, 0xbe, 0xe9, + 0x6d, 0x22, 0x7a, 0xf3, 0x86, 0x0a, 0x06, 0x15, 0x6c, 0x11, 0x79, 0x84, 0x07, 0xf1, 0x69, 0x91, + 0x9f, 0xe9, 0x30, 0x55, 0xa2, 0x90, 0x43, 0xf7, 0x68, 0x67, 0xd2, 0x3f, 0xbe, 0xd5, 0x59, 0x7c, + 0x6a, 0xe9, 0x67, 0x15, 0x3b, 0xbd, 0x76, 0x7e, 0x79, 0xe8, 0x04, 0xfd, 0x78, 0x3b, 0x1a, 0x7f, + 0x47, 0xb8, 0xdf, 0x91, 0x10, 0x8d, 0x7b, 0x9c, 0x45, 0xc0, 0xf5, 0x10, 0x59, 0xab, 0x03, 0xaf, + 0x09, 0xfe, 0xa2, 0x9a, 0x9e, 0xb0, 0x4c, 0x4d, 0x9f, 0x57, 0x2e, 0x3f, 0x2e, 0x0f, 0xff, 0xa7, + 0x86, 0xda, 0xe6, 0x49, 0xc2, 0xa4, 0x01, 0x15, 0x34, 0x47, 0x91, 0xfb, 0xb8, 0x57, 0x67, 0x6a, + 0xf2, 0xdf, 0xfe, 0x3b, 0xff, 0x0c, 0x0c, 0xcb, 0xb8, 0x6e, 0x2e, 0xd0, 0x88, 0xc7, 0xef, 0xf1, + 0xa0, 0xcb, 0x92, 0x3d, 0xec, 0xce, 0x67, 0xb6, 0xbb, 0xdd, 0xc0, 0x9d, 0xcf, 0xc8, 0x2b, 0x3c, + 0x92, 0x4c, 0x99, 0x8c, 0x71, 0xfe, 0x29, 0xac, 0x1f, 0x40, 0xb2, 0xed, 0xd8, 0xfd, 0x77, 0xc7, + 0xc3, 0xcd, 0x5a, 0xfd, 0x93, 0x92, 0x96, 0x19, 0x47, 0xf8, 0xfa, 0xa6, 0xfb, 0x3b, 0x98, 0x68, + 0xc3, 0x94, 0x09, 0x4d, 0xb6, 0x00, 0x6d, 0xd8, 0x42, 0x86, 0x0b, 0x6d, 0x8f, 0xdf, 0x09, 0xf6, + 0x2d, 0xf3, 0xba, 0x25, 0x5e, 0x6a, 0x32, 0xc1, 0xfb, 0x90, 0x27, 0x7f, 0x6a, 0x5d, 0xab, 0xdd, + 0x83, 0x3c, 0xe9, 0x28, 0xa7, 0x0f, 0x97, 0x2b, 0xea, 0x5c, 0xac, 0xa8, 0x73, 0xb5, 0xa2, 0xe8, + 0x73, 0x49, 0xd1, 0xb7, 0x92, 0xa2, 0xf3, 0x92, 0xa2, 0x65, 0x49, 0xd1, 0xcf, 0x92, 0xa2, 0x5f, + 0x25, 0x75, 0xae, 0x4a, 0x8a, 0xbe, 0xae, 0xa9, 0xb3, 0x5c, 0x53, 0xe7, 0x62, 0x4d, 0x9d, 0x37, + 0x3d, 0x7b, 0x0f, 0x15, 0xf5, 0xec, 0x0b, 0xbb, 0xf7, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x03, 0x08, + 0xac, 0x7f, 0xf2, 0x02, 0x00, 0x00, } func (this *DeletePlan) Equal(that interface{}) bool { diff --git a/pkg/chunk/storage/caching_index_client.pb.go b/pkg/chunk/storage/caching_index_client.pb.go index c90cffbbc34..a0bfe0a53a6 100644 --- a/pkg/chunk/storage/caching_index_client.pb.go +++ b/pkg/chunk/storage/caching_index_client.pb.go @@ -26,8 +26,8 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Entry struct { - Column Bytes `protobuf:"bytes,1,opt,name=Column,json=column,proto3,customtype=Bytes" json:"Column"` - Value Bytes `protobuf:"bytes,2,opt,name=Value,json=value,proto3,customtype=Bytes" json:"Value"` + Column Bytes `protobuf:"bytes,1,opt,name=Column,proto3,customtype=Bytes" json:"Column"` + Value Bytes `protobuf:"bytes,2,opt,name=Value,proto3,customtype=Bytes" json:"Value"` } func (m *Entry) Reset() { *m = Entry{} } @@ -140,27 +140,27 @@ func init() { func init() { proto.RegisterFile("caching_index_client.proto", fileDescriptor_6a83955bbc783296) } var fileDescriptor_6a83955bbc783296 = []byte{ - // 313 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, - 0x14, 0x85, 0xed, 0x3f, 0x4d, 0xaa, 0xba, 0x3f, 0x08, 0x79, 0x40, 0x51, 0x87, 0xdb, 0xa8, 0x08, - 0x29, 0x0b, 0xa9, 0x04, 0x3c, 0x41, 0x10, 0x2f, 0x10, 0x24, 0xd6, 0xca, 0x75, 0x4d, 0x6a, 0x91, - 0xda, 0x55, 0xea, 0xa0, 0x66, 0x63, 0x63, 0xe5, 0x31, 0x78, 0x94, 0x8e, 0x1d, 0x2b, 0x86, 0x8a, - 0xba, 0x0b, 0x63, 0x1f, 0x01, 0xd5, 0x14, 0x89, 0x81, 0xed, 0x1c, 0x7f, 0xc7, 0xf7, 0x5c, 0x5d, - 0xd2, 0xe1, 0x8c, 0x8f, 0xa5, 0xca, 0x07, 0x52, 0x8d, 0xc4, 0x7c, 0xc0, 0x0b, 0x29, 0x94, 0x49, - 0xa6, 0xa5, 0x36, 0x9a, 0x36, 0x67, 0x46, 0x97, 0x2c, 0x17, 0x9d, 0x8b, 0x5c, 0x9a, 0x71, 0x35, - 0x4c, 0xb8, 0x9e, 0xf4, 0x73, 0x9d, 0xeb, 0xbe, 0xe3, 0xc3, 0xea, 0xc1, 0x39, 0x67, 0x9c, 0xfa, - 0xfe, 0xd7, 0xbb, 0x23, 0xfe, 0xad, 0x32, 0x65, 0x4d, 0xcf, 0x49, 0x70, 0xa3, 0x8b, 0x6a, 0xa2, - 0x42, 0x1c, 0xe1, 0xf8, 0x7f, 0x7a, 0xb4, 0x58, 0x77, 0xd1, 0xfb, 0xba, 0xeb, 0xa7, 0xb5, 0x11, - 0xb3, 0x2c, 0xe0, 0x0e, 0xd2, 0x33, 0xe2, 0xdf, 0xb3, 0xa2, 0x12, 0xe1, 0xbf, 0xbf, 0x52, 0xfe, - 0xd3, 0x9e, 0xf5, 0x5e, 0x30, 0x69, 0x65, 0x82, 0x8d, 0x52, 0x66, 0xf8, 0x98, 0x26, 0xa4, 0x29, - 0x94, 0x29, 0xa5, 0x98, 0x85, 0x38, 0xf2, 0xe2, 0xf6, 0xe5, 0x71, 0x72, 0x58, 0x36, 0x71, 0xd5, - 0x69, 0x63, 0x3f, 0x24, 0xfb, 0x09, 0xd1, 0x13, 0xe2, 0x3d, 0x8a, 0xda, 0x15, 0xb4, 0xb2, 0xbd, - 0xa4, 0xa7, 0x24, 0x10, 0xf3, 0xa9, 0x2c, 0xeb, 0xd0, 0x8b, 0x70, 0xec, 0x65, 0x07, 0x47, 0x23, - 0xd2, 0xe6, 0xac, 0x1c, 0x49, 0xc5, 0x0a, 0x69, 0xea, 0xb0, 0x11, 0xe1, 0xd8, 0xcf, 0x7e, 0x3f, - 0xa5, 0xd7, 0xcb, 0x0d, 0xa0, 0xd5, 0x06, 0xd0, 0x6e, 0x03, 0xf8, 0xd9, 0x02, 0x7e, 0xb3, 0x80, - 0x17, 0x16, 0xf0, 0xd2, 0x02, 0xfe, 0xb0, 0x80, 0x3f, 0x2d, 0xa0, 0x9d, 0x05, 0xfc, 0xba, 0x05, - 0xb4, 0xdc, 0x02, 0x5a, 0x6d, 0x01, 0x0d, 0x03, 0x77, 0x9b, 0xab, 0xaf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xce, 0x7e, 0x67, 0x82, 0x71, 0x01, 0x00, 0x00, + // 311 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x6e, 0xea, 0x30, + 0x14, 0x86, 0x7d, 0x6e, 0x08, 0x08, 0x73, 0xef, 0xd5, 0x95, 0x87, 0xab, 0x88, 0xe1, 0x10, 0x51, + 0x55, 0xca, 0xd2, 0x20, 0xb5, 0x7d, 0x82, 0x54, 0x7d, 0x81, 0x54, 0xea, 0x8a, 0x4c, 0x70, 0x83, + 0xd5, 0x60, 0xa3, 0xe0, 0x48, 0x64, 0xeb, 0xd6, 0xb5, 0x8f, 0xd1, 0x47, 0x61, 0x64, 0x44, 0x1d, + 0x50, 0x31, 0x4b, 0x47, 0x1e, 0xa1, 0xc2, 0x50, 0xa9, 0x43, 0xb7, 0xff, 0xf7, 0xf7, 0xfb, 0xfc, + 0x47, 0x87, 0x76, 0x33, 0x9e, 0x4d, 0xa4, 0xca, 0x87, 0x52, 0x8d, 0xc5, 0x62, 0x98, 0x15, 0x52, + 0x28, 0x13, 0xcf, 0x4a, 0x6d, 0x34, 0x6b, 0xcd, 0x8d, 0x2e, 0x79, 0x2e, 0xba, 0x17, 0xb9, 0x34, + 0x93, 0x6a, 0x14, 0x67, 0x7a, 0x3a, 0xc8, 0x75, 0xae, 0x07, 0x8e, 0x8f, 0xaa, 0x07, 0xe7, 0x9c, + 0x71, 0xea, 0xf8, 0xaf, 0x7f, 0x47, 0xfd, 0x5b, 0x65, 0xca, 0x9a, 0x9d, 0xd3, 0xe6, 0x8d, 0x2e, + 0xaa, 0xa9, 0x0a, 0x20, 0x84, 0xe8, 0x77, 0xf2, 0x67, 0xb9, 0xe9, 0x91, 0xb7, 0x4d, 0xcf, 0x4f, + 0x6a, 0x23, 0xe6, 0xe9, 0x09, 0xb2, 0x33, 0xea, 0xdf, 0xf3, 0xa2, 0x12, 0xc1, 0xaf, 0x9f, 0x52, + 0x47, 0xd6, 0x7f, 0x06, 0xda, 0x4e, 0x05, 0x1f, 0x27, 0xdc, 0x64, 0x13, 0x16, 0xd3, 0x96, 0x50, + 0xa6, 0x94, 0x62, 0x1e, 0x40, 0xe8, 0x45, 0x9d, 0xcb, 0xbf, 0xf1, 0x69, 0xd9, 0xd8, 0x55, 0x27, + 0x8d, 0xc3, 0x90, 0xf4, 0x2b, 0xc4, 0xfe, 0x51, 0xef, 0x51, 0xd4, 0xae, 0xa0, 0x9d, 0x1e, 0x24, + 0xfb, 0x4f, 0x9b, 0x62, 0x31, 0x93, 0x65, 0x1d, 0x78, 0x21, 0x44, 0x5e, 0x7a, 0x72, 0x2c, 0xa4, + 0x9d, 0x8c, 0x97, 0x63, 0xa9, 0x78, 0x21, 0x4d, 0x1d, 0x34, 0x42, 0x88, 0xfc, 0xf4, 0xfb, 0x53, + 0x72, 0xbd, 0xda, 0x22, 0x59, 0x6f, 0x91, 0xec, 0xb7, 0x08, 0x4f, 0x16, 0xe1, 0xd5, 0x22, 0x2c, + 0x2d, 0xc2, 0xca, 0x22, 0xbc, 0x5b, 0x84, 0x0f, 0x8b, 0x64, 0x6f, 0x11, 0x5e, 0x76, 0x48, 0x56, + 0x3b, 0x24, 0xeb, 0x1d, 0x92, 0x51, 0xd3, 0xdd, 0xe6, 0xea, 0x33, 0x00, 0x00, 0xff, 0xff, 0xc2, + 0xe7, 0xfe, 0xff, 0x71, 0x01, 0x00, 0x00, } func (this *Entry) Equal(that interface{}) bool { diff --git a/pkg/ingester/client/cortex.pb.go b/pkg/ingester/client/cortex.pb.go index 17212cef68b..bcc94a7c60b 100644 --- a/pkg/ingester/client/cortex.pb.go +++ b/pkg/ingester/client/cortex.pb.go @@ -121,7 +121,7 @@ func (MetricMetadata_MetricType) EnumDescriptor() ([]byte, []int) { type WriteRequest struct { Timeseries []PreallocTimeseries `protobuf:"bytes,1,rep,name=timeseries,proto3,customtype=PreallocTimeseries" json:"timeseries"` - Source WriteRequest_SourceEnum `protobuf:"varint,2,opt,name=Source,json=source,proto3,enum=cortex.WriteRequest_SourceEnum" json:"Source,omitempty"` + Source WriteRequest_SourceEnum `protobuf:"varint,2,opt,name=Source,proto3,enum=cortex.WriteRequest_SourceEnum" json:"Source,omitempty"` Metadata []*MetricMetadata `protobuf:"bytes,3,rep,name=metadata,proto3" json:"metadata,omitempty"` } @@ -1606,99 +1606,98 @@ func init() { func init() { proto.RegisterFile("cortex.proto", fileDescriptor_893a47d0a749d749) } var fileDescriptor_893a47d0a749d749 = []byte{ - // 1457 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcb, 0x6f, 0x1b, 0x55, - 0x17, 0x9f, 0x1b, 0x3f, 0x12, 0x1f, 0x3b, 0xce, 0xe4, 0x26, 0x6d, 0x5d, 0x57, 0xdf, 0xb8, 0xbd, - 0x52, 0xfb, 0x45, 0xdf, 0x47, 0xd3, 0x92, 0xaa, 0x90, 0x05, 0xa8, 0x72, 0x5a, 0x27, 0x35, 0xc4, - 0x4e, 0x7a, 0xed, 0x50, 0x40, 0x42, 0xd6, 0xc4, 0xbe, 0x49, 0x46, 0xcc, 0x8c, 0xdd, 0x79, 0x20, - 0xb2, 0x40, 0x42, 0x62, 0xc9, 0x82, 0x2e, 0xf9, 0x13, 0x58, 0xb3, 0x61, 0xcf, 0xaa, 0xcb, 0x2e, - 0x2b, 0x16, 0x15, 0x4d, 0x37, 0xec, 0xa8, 0xf8, 0x0b, 0xd0, 0x7d, 0xcc, 0x78, 0xc6, 0x75, 0xa0, - 0x3c, 0xba, 0x9b, 0x7b, 0x1e, 0xbf, 0x7b, 0xee, 0xef, 0x9e, 0x73, 0xee, 0x19, 0x28, 0xf5, 0x87, - 0x5e, 0xc0, 0x3e, 0x5f, 0x1d, 0x79, 0xc3, 0x60, 0x88, 0xf3, 0x72, 0x55, 0xbd, 0x7a, 0x68, 0x05, - 0x47, 0xe1, 0xfe, 0x6a, 0x7f, 0xe8, 0x5c, 0x3b, 0x1c, 0x1e, 0x0e, 0xaf, 0x09, 0xf5, 0x7e, 0x78, - 0x20, 0x56, 0x62, 0x21, 0xbe, 0xa4, 0x1b, 0xf9, 0x0d, 0x41, 0xe9, 0xbe, 0x67, 0x05, 0x8c, 0xb2, - 0x07, 0x21, 0xf3, 0x03, 0xdc, 0x06, 0x08, 0x2c, 0x87, 0xf9, 0xcc, 0xb3, 0x98, 0x5f, 0x41, 0x17, - 0x33, 0x2b, 0xc5, 0x35, 0xbc, 0xaa, 0xb6, 0xea, 0x5a, 0x0e, 0xeb, 0x08, 0xcd, 0x46, 0xf5, 0xd1, - 0xd3, 0x9a, 0xf6, 0xd3, 0xd3, 0x1a, 0xde, 0xf5, 0x98, 0x69, 0xdb, 0xc3, 0x7e, 0x37, 0xf6, 0xa2, - 0x09, 0x04, 0xfc, 0x36, 0xe4, 0x3b, 0xc3, 0xd0, 0xeb, 0xb3, 0xca, 0xcc, 0x45, 0xb4, 0x52, 0x5e, - 0xab, 0x45, 0x58, 0xc9, 0x5d, 0x57, 0xa5, 0x49, 0xc3, 0x0d, 0x1d, 0x9a, 0xf7, 0xc5, 0x37, 0x5e, - 0x87, 0x39, 0x87, 0x05, 0xe6, 0xc0, 0x0c, 0xcc, 0x4a, 0x46, 0x84, 0x71, 0x36, 0x72, 0x6d, 0xb1, - 0xc0, 0xb3, 0xfa, 0x2d, 0xa5, 0xdd, 0xc8, 0x3e, 0x7a, 0x5a, 0x43, 0x34, 0xb6, 0x26, 0x35, 0x80, - 0x31, 0x1e, 0x9e, 0x85, 0x4c, 0x7d, 0xb7, 0xa9, 0x6b, 0x78, 0x0e, 0xb2, 0x74, 0x6f, 0xbb, 0xa1, - 0x23, 0xb2, 0x00, 0xf3, 0x6a, 0x77, 0x7f, 0x34, 0x74, 0x7d, 0x46, 0xde, 0x85, 0x22, 0x65, 0xe6, - 0x20, 0xe2, 0x60, 0x15, 0x66, 0x1f, 0x84, 0x49, 0x02, 0x96, 0xa3, 0x9d, 0xef, 0x85, 0xcc, 0x3b, - 0x56, 0x66, 0x34, 0x32, 0x22, 0xb7, 0xa0, 0x24, 0xdd, 0x25, 0x1c, 0xbe, 0x06, 0xb3, 0x1e, 0xf3, - 0x43, 0x3b, 0x88, 0xfc, 0xcf, 0x4c, 0xf8, 0x4b, 0x3b, 0x1a, 0x59, 0x91, 0x6f, 0x11, 0x94, 0x92, - 0xd0, 0xf8, 0x0d, 0xc0, 0x7e, 0x60, 0x7a, 0x41, 0x4f, 0x30, 0x19, 0x98, 0xce, 0xa8, 0xe7, 0x70, - 0x30, 0xb4, 0x92, 0xa1, 0xba, 0xd0, 0x74, 0x23, 0x45, 0xcb, 0xc7, 0x2b, 0xa0, 0x33, 0x77, 0x90, - 0xb6, 0x9d, 0x11, 0xb6, 0x65, 0xe6, 0x0e, 0x92, 0x96, 0xd7, 0x61, 0xce, 0x31, 0x83, 0xfe, 0x11, - 0xf3, 0x7c, 0x45, 0x6a, 0x7c, 0xb4, 0x6d, 0x73, 0x9f, 0xd9, 0x2d, 0xa9, 0xa4, 0xb1, 0x15, 0x69, - 0xc2, 0x7c, 0x2a, 0x68, 0xbc, 0xfe, 0x8a, 0x09, 0xc2, 0x6f, 0x45, 0x4b, 0xa6, 0x02, 0x79, 0x88, - 0x60, 0x49, 0x60, 0x75, 0x02, 0x8f, 0x99, 0x4e, 0x8c, 0x78, 0x0b, 0x8a, 0xfd, 0xa3, 0xd0, 0xfd, - 0x34, 0x05, 0x79, 0xee, 0x65, 0xc8, 0xdb, 0xdc, 0x48, 0xe1, 0x26, 0x3d, 0x26, 0x42, 0x9a, 0xf9, - 0x0b, 0x21, 0xdd, 0x00, 0x2c, 0xce, 0xfd, 0x81, 0x69, 0x87, 0xcc, 0x8f, 0xd8, 0xff, 0x0f, 0x80, - 0xcd, 0xa5, 0x3d, 0xd7, 0x74, 0x98, 0x60, 0xbd, 0x40, 0x0b, 0x42, 0xd2, 0x36, 0x1d, 0x46, 0xd6, - 0x61, 0x29, 0xe5, 0xa4, 0x8e, 0x71, 0x09, 0x4a, 0xd2, 0xeb, 0x33, 0x21, 0x17, 0xe7, 0x28, 0xd0, - 0xa2, 0x3d, 0x36, 0x25, 0x4b, 0xb0, 0xb8, 0x1d, 0xc1, 0x44, 0xbb, 0x91, 0x9b, 0x2a, 0x06, 0x25, - 0x54, 0x68, 0x35, 0x28, 0x8e, 0x63, 0x88, 0xc0, 0x20, 0x0e, 0xc2, 0x27, 0x18, 0xf4, 0x3d, 0x9f, - 0x79, 0x9d, 0xc0, 0x0c, 0x62, 0xa8, 0x1f, 0x10, 0x2c, 0x26, 0x84, 0x0a, 0xea, 0x32, 0x94, 0x2d, - 0xf7, 0x90, 0xf9, 0x81, 0x35, 0x74, 0x7b, 0x9e, 0x19, 0xc8, 0x23, 0x21, 0x3a, 0x1f, 0x4b, 0xa9, - 0x19, 0x30, 0x7e, 0x6a, 0x37, 0x74, 0x7a, 0x31, 0x8b, 0x68, 0x25, 0x4b, 0x0b, 0x6e, 0xe8, 0x48, - 0xf2, 0x78, 0x4a, 0x9a, 0x23, 0xab, 0x37, 0x81, 0x94, 0x11, 0x48, 0xba, 0x39, 0xb2, 0x9a, 0x29, - 0xb0, 0x55, 0x58, 0xf2, 0x42, 0x9b, 0x4d, 0x9a, 0x67, 0x85, 0xf9, 0x22, 0x57, 0xa5, 0xec, 0xc9, - 0x27, 0xb0, 0xc4, 0x03, 0x6f, 0xde, 0x49, 0x87, 0x7e, 0x0e, 0x66, 0x43, 0x9f, 0x79, 0x3d, 0x6b, - 0xa0, 0xae, 0x21, 0xcf, 0x97, 0xcd, 0x01, 0xbe, 0x0a, 0x59, 0xd1, 0x19, 0x78, 0x98, 0xc5, 0xb5, - 0xf3, 0xd1, 0x65, 0xbf, 0x74, 0x78, 0x2a, 0xcc, 0xc8, 0x16, 0x60, 0xae, 0xf2, 0xd3, 0xe8, 0x6f, - 0x42, 0xce, 0xe7, 0x02, 0x95, 0x72, 0x17, 0x92, 0x28, 0x13, 0x91, 0x50, 0x69, 0x49, 0xbe, 0x47, - 0x60, 0xc8, 0xf6, 0xe3, 0x6f, 0x0e, 0xbd, 0x64, 0xcd, 0xf8, 0xaf, 0xbb, 0x76, 0xd7, 0xa1, 0x14, - 0x55, 0x65, 0xcf, 0x67, 0x81, 0xaa, 0xdf, 0x33, 0xd3, 0xea, 0xd7, 0xa7, 0xc5, 0xc8, 0xb4, 0xc3, - 0x02, 0xd2, 0x84, 0xda, 0xa9, 0x31, 0x2b, 0x2a, 0xae, 0x40, 0xde, 0x11, 0x26, 0x8a, 0x8b, 0x72, - 0xba, 0xd7, 0x52, 0xa5, 0x25, 0x15, 0x38, 0xab, 0xa0, 0xa2, 0xf6, 0x1b, 0xe5, 0x5e, 0x0b, 0xce, - 0xbd, 0xa4, 0x51, 0xe0, 0x6b, 0x89, 0x56, 0x8e, 0xfe, 0xa8, 0x95, 0x27, 0x9a, 0xf8, 0x8f, 0x08, - 0x16, 0x26, 0x4a, 0x9f, 0x73, 0x75, 0xe0, 0x0d, 0x1d, 0x95, 0x54, 0xc9, 0xb4, 0x28, 0x73, 0x79, - 0x53, 0x89, 0x9b, 0x83, 0x64, 0xde, 0xcc, 0xa4, 0xf2, 0xe6, 0x16, 0xe4, 0x45, 0x0d, 0x45, 0xed, - 0x6f, 0x31, 0x45, 0xdf, 0xae, 0x69, 0x79, 0x1b, 0xcb, 0xea, 0x65, 0x2b, 0x09, 0x51, 0x7d, 0x60, - 0x8e, 0x02, 0xe6, 0x51, 0xe5, 0x86, 0xff, 0x0f, 0x79, 0xd9, 0x7a, 0x2a, 0x59, 0x01, 0x30, 0x1f, - 0x01, 0x24, 0xbb, 0x93, 0x32, 0x21, 0xdf, 0x20, 0xc8, 0xc9, 0xd0, 0x5f, 0x57, 0x52, 0x54, 0x61, - 0x8e, 0xb9, 0xfd, 0xe1, 0xc0, 0x72, 0x0f, 0x45, 0x2d, 0xe6, 0x68, 0xbc, 0xc6, 0x58, 0xd5, 0x08, - 0x2f, 0xba, 0x92, 0x2a, 0x84, 0x0a, 0x9c, 0xed, 0x7a, 0xa6, 0xeb, 0x1f, 0x30, 0x4f, 0x04, 0x16, - 0x67, 0x00, 0xf9, 0x02, 0x60, 0xcc, 0x77, 0x82, 0x27, 0xf4, 0xf7, 0x78, 0x5a, 0x85, 0x59, 0xdf, - 0x74, 0x46, 0x76, 0xdc, 0x90, 0xe3, 0x8c, 0xea, 0x08, 0xb1, 0x62, 0x2a, 0x32, 0x22, 0x37, 0xa1, - 0x10, 0x43, 0xf3, 0xc8, 0xe3, 0xd6, 0x5b, 0xa2, 0xe2, 0x1b, 0x2f, 0x43, 0x4e, 0x34, 0x56, 0x41, - 0x44, 0x89, 0xca, 0x05, 0xa9, 0x43, 0x5e, 0xe2, 0x8d, 0xf5, 0xb2, 0xb9, 0xc9, 0x05, 0x6f, 0xca, - 0x53, 0x58, 0x2c, 0x06, 0x63, 0x0a, 0x49, 0x1d, 0xe6, 0x53, 0x35, 0x91, 0x7a, 0x24, 0xd1, 0x2b, - 0x3d, 0x92, 0x5f, 0xcf, 0x40, 0x39, 0x9d, 0xc9, 0xf8, 0x26, 0x64, 0x83, 0xe3, 0x91, 0x8c, 0xa6, - 0xbc, 0x76, 0x69, 0x7a, 0xbe, 0xab, 0x65, 0xf7, 0x78, 0xc4, 0xa8, 0x30, 0xe7, 0x6d, 0x5f, 0x56, - 0x9a, 0x7c, 0x7b, 0x64, 0xf2, 0x82, 0x14, 0xf1, 0xbe, 0xcf, 0xa9, 0x39, 0x62, 0xf6, 0x48, 0x5c, - 0x6a, 0x81, 0x8a, 0x6f, 0x2e, 0x0b, 0x5d, 0x2b, 0xa8, 0xe4, 0xa4, 0x8c, 0x7f, 0x93, 0x63, 0x80, - 0x31, 0x38, 0x2e, 0xc2, 0xec, 0x5e, 0xfb, 0xfd, 0xf6, 0xce, 0xfd, 0xb6, 0xae, 0xf1, 0xc5, 0xed, - 0x9d, 0xbd, 0x76, 0xb7, 0x41, 0x75, 0x84, 0x0b, 0x90, 0xdb, 0xaa, 0xef, 0x6d, 0x35, 0xf4, 0x19, - 0x3c, 0x0f, 0x85, 0xbb, 0xcd, 0x4e, 0x77, 0x67, 0x8b, 0xd6, 0x5b, 0x7a, 0x06, 0x63, 0x28, 0x0b, - 0xcd, 0x58, 0x96, 0xe5, 0xae, 0x9d, 0xbd, 0x56, 0xab, 0x4e, 0x3f, 0xd2, 0x73, 0x7c, 0xa0, 0x6a, - 0xb6, 0x37, 0x77, 0xf4, 0x3c, 0x2e, 0xc1, 0x5c, 0xa7, 0x5b, 0xef, 0x36, 0x3a, 0x8d, 0xae, 0x3e, - 0x4b, 0x9a, 0x90, 0x97, 0x5b, 0xff, 0xe3, 0x2c, 0x22, 0x3d, 0x28, 0x25, 0x29, 0xc7, 0x97, 0x53, - 0xac, 0xc6, 0x70, 0x42, 0x9d, 0x60, 0x31, 0xca, 0x1f, 0x49, 0xdf, 0x44, 0xfe, 0x64, 0x84, 0x50, - 0xe5, 0xcf, 0x57, 0x08, 0xca, 0xe3, 0xb4, 0xdf, 0xb4, 0x6c, 0xf6, 0x6f, 0x74, 0x99, 0x2a, 0xcc, - 0x1d, 0x58, 0x36, 0x13, 0x31, 0xc8, 0xed, 0xe2, 0xf5, 0xb4, 0xaa, 0xfc, 0xdf, 0x7b, 0x50, 0x88, - 0x8f, 0xc0, 0x6f, 0xa4, 0x71, 0x6f, 0xaf, 0xbe, 0xad, 0x6b, 0xfc, 0x46, 0xda, 0x3b, 0xdd, 0x9e, - 0x5c, 0x22, 0xbc, 0x00, 0x45, 0xda, 0xd8, 0x6a, 0x7c, 0xd8, 0x6b, 0xd5, 0xbb, 0xb7, 0xef, 0xea, - 0x33, 0xfc, 0x8a, 0xa4, 0xa0, 0xbd, 0xa3, 0x64, 0x99, 0xb5, 0x5f, 0x73, 0x30, 0x17, 0xc5, 0xc8, - 0xb3, 0x70, 0x37, 0xf4, 0x8f, 0xf0, 0xf2, 0xb4, 0xa9, 0xbb, 0x7a, 0x66, 0x42, 0xaa, 0x3a, 0x81, - 0x86, 0xdf, 0x82, 0x9c, 0x18, 0xd4, 0xf0, 0xd4, 0xc1, 0xb7, 0x3a, 0x7d, 0x9c, 0x25, 0x1a, 0xbe, - 0x03, 0xc5, 0xc4, 0x80, 0x77, 0x8a, 0xf7, 0x85, 0x94, 0x34, 0x3d, 0x0b, 0x12, 0xed, 0x3a, 0xc2, - 0x77, 0xa1, 0x98, 0x98, 0xaf, 0x70, 0x35, 0x95, 0x34, 0xa9, 0x49, 0x6d, 0x8c, 0x35, 0x65, 0x20, - 0x23, 0x1a, 0x6e, 0x00, 0x8c, 0x47, 0x2b, 0x7c, 0x3e, 0x65, 0x9c, 0x9c, 0xc1, 0xaa, 0xd5, 0x69, - 0xaa, 0x18, 0x66, 0x03, 0x0a, 0xf1, 0x60, 0x81, 0x2b, 0x53, 0x66, 0x0d, 0x09, 0x72, 0xfa, 0x14, - 0x42, 0x34, 0xbc, 0x09, 0xa5, 0xba, 0x6d, 0xbf, 0x0a, 0x4c, 0x35, 0xa9, 0xf1, 0x27, 0x71, 0xec, - 0xf8, 0x99, 0x9d, 0x7c, 0xcb, 0xf1, 0x95, 0x74, 0x93, 0x39, 0x6d, 0x40, 0xa9, 0xfe, 0xf7, 0x4f, - 0xed, 0xe2, 0xdd, 0xba, 0xb0, 0x30, 0xf1, 0xa8, 0x63, 0x63, 0xc2, 0x7b, 0x62, 0x0e, 0xa8, 0xd6, - 0x4e, 0xd5, 0xc7, 0xa8, 0x2d, 0x28, 0xa7, 0x1f, 0x21, 0x7c, 0xda, 0xb4, 0x5f, 0x8d, 0x77, 0x3b, - 0xe5, 0xd5, 0xd2, 0x56, 0xd0, 0xc6, 0x3b, 0x8f, 0x9f, 0x19, 0xda, 0x93, 0x67, 0x86, 0xf6, 0xe2, - 0x99, 0x81, 0xbe, 0x3c, 0x31, 0xd0, 0x77, 0x27, 0x06, 0x7a, 0x74, 0x62, 0xa0, 0xc7, 0x27, 0x06, - 0xfa, 0xf9, 0xc4, 0x40, 0xbf, 0x9c, 0x18, 0xda, 0x8b, 0x13, 0x03, 0x3d, 0x7c, 0x6e, 0x68, 0x8f, - 0x9f, 0x1b, 0xda, 0x93, 0xe7, 0x86, 0xf6, 0x71, 0xbe, 0x6f, 0x5b, 0xcc, 0x0d, 0xf6, 0xf3, 0xe2, - 0x47, 0xf8, 0xc6, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x01, 0x6d, 0x44, 0x4f, 0x0f, 0x00, - 0x00, + // 1456 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xbb, 0x6f, 0x1b, 0x47, + 0x13, 0xbf, 0x15, 0x1f, 0x12, 0x87, 0x14, 0x75, 0x5a, 0xc9, 0x36, 0x4d, 0xe3, 0x3b, 0xda, 0x0b, + 0xd8, 0x9f, 0xf0, 0x7d, 0xb1, 0xec, 0xc8, 0x70, 0xa2, 0x22, 0x81, 0x41, 0xd9, 0x94, 0xcc, 0x44, + 0xa4, 0xe4, 0x25, 0x15, 0x27, 0x01, 0x02, 0xe2, 0x44, 0xae, 0xa4, 0x43, 0xee, 0x8e, 0xf4, 0x3d, + 0x82, 0xa8, 0x08, 0x10, 0x20, 0x65, 0x8a, 0xb8, 0xcc, 0x9f, 0x90, 0x3a, 0x4d, 0xfa, 0x54, 0x2e, + 0x5d, 0x1a, 0x29, 0x8c, 0x58, 0x6e, 0xd2, 0xc5, 0xc8, 0x5f, 0x10, 0xec, 0xe3, 0x8e, 0x77, 0x34, + 0x95, 0x38, 0x0f, 0x77, 0xb7, 0x33, 0xbf, 0xf9, 0xed, 0xec, 0xec, 0xcc, 0xec, 0x1c, 0x94, 0xfa, + 0x43, 0x2f, 0x60, 0x9f, 0xaf, 0x8e, 0xbc, 0x61, 0x30, 0xc4, 0x79, 0xb9, 0xaa, 0x5e, 0x3d, 0xb4, + 0x82, 0xa3, 0x70, 0x7f, 0xb5, 0x3f, 0x74, 0xae, 0x1d, 0x0e, 0x0f, 0x87, 0xd7, 0x84, 0x7a, 0x3f, + 0x3c, 0x10, 0x2b, 0xb1, 0x10, 0x5f, 0xd2, 0x8c, 0xfc, 0x86, 0xa0, 0x74, 0xdf, 0xb3, 0x02, 0x46, + 0xd9, 0x83, 0x90, 0xf9, 0x01, 0x6e, 0x03, 0x04, 0x96, 0xc3, 0x7c, 0xe6, 0x59, 0xcc, 0xaf, 0xa0, + 0x8b, 0x99, 0x95, 0xe2, 0x1a, 0x5e, 0x55, 0x5b, 0x75, 0x2d, 0x87, 0x75, 0x84, 0x66, 0xa3, 0xfa, + 0xe8, 0x69, 0x4d, 0xfb, 0xe9, 0x69, 0x0d, 0xef, 0x7a, 0xcc, 0xb4, 0xed, 0x61, 0xbf, 0x1b, 0x5b, + 0xd1, 0x04, 0x03, 0x7e, 0x1b, 0xf2, 0x9d, 0x61, 0xe8, 0xf5, 0x59, 0x65, 0xe6, 0x22, 0x5a, 0x29, + 0xaf, 0xd5, 0x22, 0xae, 0xe4, 0xae, 0xab, 0x12, 0xd2, 0x70, 0x43, 0x87, 0x2a, 0x38, 0x5e, 0x87, + 0x39, 0x87, 0x05, 0xe6, 0xc0, 0x0c, 0xcc, 0x4a, 0x46, 0xb8, 0x71, 0x36, 0x32, 0x6d, 0xb1, 0xc0, + 0xb3, 0xfa, 0x2d, 0xa5, 0xdd, 0xc8, 0x3e, 0x7a, 0x5a, 0x43, 0x34, 0x46, 0x93, 0x1a, 0xc0, 0x98, + 0x0f, 0xcf, 0x42, 0xa6, 0xbe, 0xdb, 0xd4, 0x35, 0x3c, 0x07, 0x59, 0xba, 0xb7, 0xdd, 0xd0, 0x11, + 0x59, 0x80, 0x79, 0xb5, 0xbb, 0x3f, 0x1a, 0xba, 0x3e, 0x23, 0xef, 0x42, 0x91, 0x32, 0x73, 0x10, + 0xc5, 0x60, 0x15, 0x66, 0x1f, 0x84, 0xc9, 0x00, 0x2c, 0x47, 0x3b, 0xdf, 0x0b, 0x99, 0x77, 0xac, + 0x60, 0x34, 0x02, 0x91, 0x5b, 0x50, 0x92, 0xe6, 0x92, 0x0e, 0x5f, 0x83, 0x59, 0x8f, 0xf9, 0xa1, + 0x1d, 0x44, 0xf6, 0x67, 0x26, 0xec, 0x25, 0x8e, 0x46, 0x28, 0xf2, 0x2d, 0x82, 0x52, 0x92, 0x1a, + 0xbf, 0x01, 0xd8, 0x0f, 0x4c, 0x2f, 0xe8, 0x89, 0x48, 0x06, 0xa6, 0x33, 0xea, 0x39, 0x9c, 0x0c, + 0xad, 0x64, 0xa8, 0x2e, 0x34, 0xdd, 0x48, 0xd1, 0xf2, 0xf1, 0x0a, 0xe8, 0xcc, 0x1d, 0xa4, 0xb1, + 0x33, 0x02, 0x5b, 0x66, 0xee, 0x20, 0x89, 0xbc, 0x0e, 0x73, 0x8e, 0x19, 0xf4, 0x8f, 0x98, 0xe7, + 0xab, 0xa0, 0xc6, 0x47, 0xdb, 0x36, 0xf7, 0x99, 0xdd, 0x92, 0x4a, 0x1a, 0xa3, 0x48, 0x13, 0xe6, + 0x53, 0x4e, 0xe3, 0xf5, 0x57, 0x4c, 0x10, 0x7e, 0x2b, 0x5a, 0x32, 0x15, 0xc8, 0x43, 0x04, 0x4b, + 0x82, 0xab, 0x13, 0x78, 0xcc, 0x74, 0x62, 0xc6, 0x5b, 0x50, 0xec, 0x1f, 0x85, 0xee, 0xa7, 0x29, + 0xca, 0x73, 0x2f, 0x53, 0xde, 0xe6, 0x20, 0xc5, 0x9b, 0xb4, 0x98, 0x70, 0x69, 0xe6, 0x2f, 0xb8, + 0x74, 0x03, 0xb0, 0x38, 0xf7, 0x07, 0xa6, 0x1d, 0x32, 0x3f, 0x8a, 0xfe, 0x7f, 0x00, 0x6c, 0x2e, + 0xed, 0xb9, 0xa6, 0xc3, 0x44, 0xd4, 0x0b, 0xb4, 0x20, 0x24, 0x6d, 0xd3, 0x61, 0x64, 0x1d, 0x96, + 0x52, 0x46, 0xea, 0x18, 0x97, 0xa0, 0x24, 0xad, 0x3e, 0x13, 0x72, 0x71, 0x8e, 0x02, 0x2d, 0xda, + 0x63, 0x28, 0x59, 0x82, 0xc5, 0xed, 0x88, 0x26, 0xda, 0x8d, 0xdc, 0x54, 0x3e, 0x28, 0xa1, 0x62, + 0xab, 0x41, 0x71, 0xec, 0x43, 0x44, 0x06, 0xb1, 0x13, 0x3e, 0xc1, 0xa0, 0xef, 0xf9, 0xcc, 0xeb, + 0x04, 0x66, 0x10, 0x53, 0xfd, 0x80, 0x60, 0x31, 0x21, 0x54, 0x54, 0x97, 0xa1, 0x6c, 0xb9, 0x87, + 0xcc, 0x0f, 0xac, 0xa1, 0xdb, 0xf3, 0xcc, 0x40, 0x1e, 0x09, 0xd1, 0xf9, 0x58, 0x4a, 0xcd, 0x80, + 0xf1, 0x53, 0xbb, 0xa1, 0xd3, 0x8b, 0xa3, 0x88, 0x56, 0xb2, 0xb4, 0xe0, 0x86, 0x8e, 0x0c, 0x1e, + 0x4f, 0x49, 0x73, 0x64, 0xf5, 0x26, 0x98, 0x32, 0x82, 0x49, 0x37, 0x47, 0x56, 0x33, 0x45, 0xb6, + 0x0a, 0x4b, 0x5e, 0x68, 0xb3, 0x49, 0x78, 0x56, 0xc0, 0x17, 0xb9, 0x2a, 0x85, 0x27, 0x9f, 0xc0, + 0x12, 0x77, 0xbc, 0x79, 0x27, 0xed, 0xfa, 0x39, 0x98, 0x0d, 0x7d, 0xe6, 0xf5, 0xac, 0x81, 0xba, + 0x86, 0x3c, 0x5f, 0x36, 0x07, 0xf8, 0x2a, 0x64, 0x45, 0x67, 0xe0, 0x6e, 0x16, 0xd7, 0xce, 0x47, + 0x97, 0xfd, 0xd2, 0xe1, 0xa9, 0x80, 0x91, 0x2d, 0xc0, 0x5c, 0xe5, 0xa7, 0xd9, 0xdf, 0x84, 0x9c, + 0xcf, 0x05, 0x2a, 0xe5, 0x2e, 0x24, 0x59, 0x26, 0x3c, 0xa1, 0x12, 0x49, 0xbe, 0x47, 0x60, 0xc8, + 0xf6, 0xe3, 0x6f, 0x0e, 0xbd, 0x64, 0xcd, 0xf8, 0xaf, 0xbb, 0x76, 0xd7, 0xa1, 0x14, 0x55, 0x65, + 0xcf, 0x67, 0x81, 0xaa, 0xdf, 0x33, 0xd3, 0xea, 0xd7, 0xa7, 0xc5, 0x08, 0xda, 0x61, 0x01, 0x69, + 0x42, 0xed, 0x54, 0x9f, 0x55, 0x28, 0xae, 0x40, 0xde, 0x11, 0x10, 0x15, 0x8b, 0x72, 0xba, 0xd7, + 0x52, 0xa5, 0x25, 0x15, 0x38, 0xab, 0xa8, 0xa2, 0xf6, 0x1b, 0xe5, 0x5e, 0x0b, 0xce, 0xbd, 0xa4, + 0x51, 0xe4, 0x6b, 0x89, 0x56, 0x8e, 0xfe, 0xa8, 0x95, 0x27, 0x9a, 0xf8, 0x8f, 0x08, 0x16, 0x26, + 0x4a, 0x9f, 0xc7, 0xea, 0xc0, 0x1b, 0x3a, 0x2a, 0xa9, 0x92, 0x69, 0x51, 0xe6, 0xf2, 0xa6, 0x12, + 0x37, 0x07, 0xc9, 0xbc, 0x99, 0x49, 0xe5, 0xcd, 0x2d, 0xc8, 0x8b, 0x1a, 0x8a, 0xda, 0xdf, 0x62, + 0x2a, 0x7c, 0xbb, 0xa6, 0xe5, 0x6d, 0x2c, 0xab, 0x97, 0xad, 0x24, 0x44, 0xf5, 0x81, 0x39, 0x0a, + 0x98, 0x47, 0x95, 0x19, 0xfe, 0x3f, 0xe4, 0x65, 0xeb, 0xa9, 0x64, 0x05, 0xc1, 0x7c, 0x44, 0x90, + 0xec, 0x4e, 0x0a, 0x42, 0xbe, 0x41, 0x90, 0x93, 0xae, 0xbf, 0xae, 0xa4, 0xa8, 0xc2, 0x1c, 0x73, + 0xfb, 0xc3, 0x81, 0xe5, 0x1e, 0x8a, 0x5a, 0xcc, 0xd1, 0x78, 0x8d, 0xb1, 0xaa, 0x11, 0x5e, 0x74, + 0x25, 0x55, 0x08, 0x15, 0x38, 0xdb, 0xf5, 0x4c, 0xd7, 0x3f, 0x60, 0x9e, 0x70, 0x2c, 0xce, 0x00, + 0xf2, 0x05, 0xc0, 0x38, 0xde, 0x89, 0x38, 0xa1, 0xbf, 0x17, 0xa7, 0x55, 0x98, 0xf5, 0x4d, 0x67, + 0x64, 0xc7, 0x0d, 0x39, 0xce, 0xa8, 0x8e, 0x10, 0xab, 0x48, 0x45, 0x20, 0x72, 0x13, 0x0a, 0x31, + 0x35, 0xf7, 0x3c, 0x6e, 0xbd, 0x25, 0x2a, 0xbe, 0xf1, 0x32, 0xe4, 0x44, 0x63, 0x15, 0x81, 0x28, + 0x51, 0xb9, 0x20, 0x75, 0xc8, 0x4b, 0xbe, 0xb1, 0x5e, 0x36, 0x37, 0xb9, 0xe0, 0x4d, 0x79, 0x4a, + 0x14, 0x8b, 0xc1, 0x38, 0x84, 0xa4, 0x0e, 0xf3, 0xa9, 0x9a, 0x48, 0x3d, 0x92, 0xe8, 0x95, 0x1e, + 0xc9, 0xaf, 0x67, 0xa0, 0x9c, 0xce, 0x64, 0x7c, 0x13, 0xb2, 0xc1, 0xf1, 0x48, 0x7a, 0x53, 0x5e, + 0xbb, 0x34, 0x3d, 0xdf, 0xd5, 0xb2, 0x7b, 0x3c, 0x62, 0x54, 0xc0, 0x79, 0xdb, 0x97, 0x95, 0x26, + 0xdf, 0x1e, 0x99, 0xbc, 0x20, 0x45, 0xbc, 0xef, 0xf3, 0xd0, 0x1c, 0x31, 0x7b, 0x24, 0x2e, 0xb5, + 0x40, 0xc5, 0x37, 0x97, 0x85, 0xae, 0x15, 0x54, 0x72, 0x52, 0xc6, 0xbf, 0xc9, 0x31, 0xc0, 0x98, + 0x1c, 0x17, 0x61, 0x76, 0xaf, 0xfd, 0x7e, 0x7b, 0xe7, 0x7e, 0x5b, 0xd7, 0xf8, 0xe2, 0xf6, 0xce, + 0x5e, 0xbb, 0xdb, 0xa0, 0x3a, 0xc2, 0x05, 0xc8, 0x6d, 0xd5, 0xf7, 0xb6, 0x1a, 0xfa, 0x0c, 0x9e, + 0x87, 0xc2, 0xdd, 0x66, 0xa7, 0xbb, 0xb3, 0x45, 0xeb, 0x2d, 0x3d, 0x83, 0x31, 0x94, 0x85, 0x66, + 0x2c, 0xcb, 0x72, 0xd3, 0xce, 0x5e, 0xab, 0x55, 0xa7, 0x1f, 0xe9, 0x39, 0x3e, 0x50, 0x35, 0xdb, + 0x9b, 0x3b, 0x7a, 0x1e, 0x97, 0x60, 0xae, 0xd3, 0xad, 0x77, 0x1b, 0x9d, 0x46, 0x57, 0x9f, 0x25, + 0x4d, 0xc8, 0xcb, 0xad, 0xff, 0x71, 0x16, 0x91, 0x1e, 0x94, 0x92, 0x21, 0xc7, 0x97, 0x53, 0x51, + 0x8d, 0xe9, 0x84, 0x3a, 0x11, 0xc5, 0x28, 0x7f, 0x64, 0xf8, 0x26, 0xf2, 0x27, 0x23, 0x84, 0x2a, + 0x7f, 0xbe, 0x42, 0x50, 0x1e, 0xa7, 0xfd, 0xa6, 0x65, 0xb3, 0x7f, 0xa3, 0xcb, 0x54, 0x61, 0xee, + 0xc0, 0xb2, 0x99, 0xf0, 0x41, 0x6e, 0x17, 0xaf, 0xa7, 0x55, 0xe5, 0xff, 0xde, 0x83, 0x42, 0x7c, + 0x04, 0x7e, 0x23, 0x8d, 0x7b, 0x7b, 0xf5, 0x6d, 0x5d, 0xe3, 0x37, 0xd2, 0xde, 0xe9, 0xf6, 0xe4, + 0x12, 0xe1, 0x05, 0x28, 0xd2, 0xc6, 0x56, 0xe3, 0xc3, 0x5e, 0xab, 0xde, 0xbd, 0x7d, 0x57, 0x9f, + 0xe1, 0x57, 0x24, 0x05, 0xed, 0x1d, 0x25, 0xcb, 0xac, 0xfd, 0x9a, 0x83, 0xb9, 0xc8, 0x47, 0x9e, + 0x85, 0xbb, 0xa1, 0x7f, 0x84, 0x97, 0xa7, 0x4d, 0xdd, 0xd5, 0x33, 0x13, 0x52, 0xd5, 0x09, 0x34, + 0xfc, 0x16, 0xe4, 0xc4, 0xa0, 0x86, 0xa7, 0x0e, 0xbe, 0xd5, 0xe9, 0xe3, 0x2c, 0xd1, 0xf0, 0x1d, + 0x28, 0x26, 0x06, 0xbc, 0x53, 0xac, 0x2f, 0xa4, 0xa4, 0xe9, 0x59, 0x90, 0x68, 0xd7, 0x11, 0xbe, + 0x0b, 0xc5, 0xc4, 0x7c, 0x85, 0xab, 0xa9, 0xa4, 0x49, 0x4d, 0x6a, 0x63, 0xae, 0x29, 0x03, 0x19, + 0xd1, 0x70, 0x03, 0x60, 0x3c, 0x5a, 0xe1, 0xf3, 0x29, 0x70, 0x72, 0x06, 0xab, 0x56, 0xa7, 0xa9, + 0x62, 0x9a, 0x0d, 0x28, 0xc4, 0x83, 0x05, 0xae, 0x4c, 0x99, 0x35, 0x24, 0xc9, 0xe9, 0x53, 0x08, + 0xd1, 0xf0, 0x26, 0x94, 0xea, 0xb6, 0xfd, 0x2a, 0x34, 0xd5, 0xa4, 0xc6, 0x9f, 0xe4, 0xb1, 0xe3, + 0x67, 0x76, 0xf2, 0x2d, 0xc7, 0x57, 0xd2, 0x4d, 0xe6, 0xb4, 0x01, 0xa5, 0xfa, 0xdf, 0x3f, 0xc5, + 0xc5, 0xbb, 0x75, 0x61, 0x61, 0xe2, 0x51, 0xc7, 0xc6, 0x84, 0xf5, 0xc4, 0x1c, 0x50, 0xad, 0x9d, + 0xaa, 0x8f, 0x59, 0x5b, 0x50, 0x4e, 0x3f, 0x42, 0xf8, 0xb4, 0x69, 0xbf, 0x1a, 0xef, 0x76, 0xca, + 0xab, 0xa5, 0xad, 0xa0, 0x8d, 0x77, 0x1e, 0x3f, 0x33, 0xb4, 0x27, 0xcf, 0x0c, 0xed, 0xc5, 0x33, + 0x03, 0x7d, 0x79, 0x62, 0xa0, 0xef, 0x4e, 0x0c, 0xf4, 0xe8, 0xc4, 0x40, 0x8f, 0x4f, 0x0c, 0xf4, + 0xf3, 0x89, 0x81, 0x7e, 0x39, 0x31, 0xb4, 0x17, 0x27, 0x06, 0x7a, 0xf8, 0xdc, 0xd0, 0x1e, 0x3f, + 0x37, 0xb4, 0x27, 0xcf, 0x0d, 0xed, 0xe3, 0x7c, 0xdf, 0xb6, 0x98, 0x1b, 0xec, 0xe7, 0xc5, 0x8f, + 0xf0, 0x8d, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x08, 0x1c, 0x63, 0x4f, 0x0f, 0x00, 0x00, } func (x MatchType) String() string { diff --git a/pkg/querier/queryrange/queryrange.pb.go b/pkg/querier/queryrange/queryrange.pb.go index 2c9f7963cc6..cb7e4130035 100644 --- a/pkg/querier/queryrange/queryrange.pb.go +++ b/pkg/querier/queryrange/queryrange.pb.go @@ -124,8 +124,8 @@ func (m *PrometheusRequest) GetCachingOptions() CachingOptions { } type PrometheusResponseHeader struct { - Name string `protobuf:"bytes,1,opt,name=Name,json=name,proto3" json:"-"` - Values []string `protobuf:"bytes,2,rep,name=Values,json=values,proto3" json:"-"` + Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"-"` + Values []string `protobuf:"bytes,2,rep,name=Values,proto3" json:"-"` } func (m *PrometheusResponseHeader) Reset() { *m = PrometheusResponseHeader{} } @@ -175,11 +175,11 @@ func (m *PrometheusResponseHeader) GetValues() []string { } type PrometheusResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,json=status,proto3" json:"status"` - Data PrometheusData `protobuf:"bytes,2,opt,name=Data,json=data,proto3" json:"data,omitempty"` - ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,json=errorType,proto3" json:"errorType,omitempty"` - Error string `protobuf:"bytes,4,opt,name=Error,json=error,proto3" json:"error,omitempty"` - Headers []*PrometheusResponseHeader `protobuf:"bytes,5,rep,name=Headers,json=headers,proto3" json:"-"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data PrometheusData `protobuf:"bytes,2,opt,name=Data,proto3" json:"data,omitempty"` + ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,proto3" json:"errorType,omitempty"` + Error string `protobuf:"bytes,4,opt,name=Error,proto3" json:"error,omitempty"` + Headers []*PrometheusResponseHeader `protobuf:"bytes,5,rep,name=Headers,proto3" json:"-"` } func (m *PrometheusResponse) Reset() { *m = PrometheusResponse{} } @@ -250,8 +250,8 @@ func (m *PrometheusResponse) GetHeaders() []*PrometheusResponseHeader { } type PrometheusData struct { - ResultType string `protobuf:"bytes,1,opt,name=ResultType,json=resultType,proto3" json:"resultType"` - Result []SampleStream `protobuf:"bytes,2,rep,name=Result,json=result,proto3" json:"result"` + ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` + Result []SampleStream `protobuf:"bytes,2,rep,name=Result,proto3" json:"result"` } func (m *PrometheusData) Reset() { *m = PrometheusData{} } @@ -520,60 +520,60 @@ func init() { func init() { proto.RegisterFile("queryrange.proto", fileDescriptor_79b02382e213d0b2) } var fileDescriptor_79b02382e213d0b2 = []byte{ - // 838 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0x8f, 0x37, 0x8e, 0x93, 0xbc, 0xad, 0xd2, 0xed, 0xb4, 0x02, 0x67, 0x25, 0xec, 0xc8, 0xe2, - 0xb0, 0x48, 0x6d, 0x22, 0x2d, 0x42, 0xe2, 0x02, 0xda, 0x9a, 0x2e, 0x2a, 0x08, 0x41, 0x35, 0x5b, - 0x71, 0xe0, 0x82, 0x26, 0xf1, 0xc3, 0x71, 0x1b, 0xff, 0xe9, 0x78, 0x8c, 0x9a, 0x03, 0x12, 0xea, - 0x27, 0xe0, 0xc8, 0x47, 0x00, 0x89, 0xef, 0x41, 0x8f, 0x7b, 0xac, 0x38, 0x18, 0x36, 0x7b, 0x41, - 0x3e, 0xf5, 0x23, 0xa0, 0x99, 0xb1, 0x13, 0xef, 0x96, 0x53, 0x2f, 0xf1, 0xfb, 0xff, 0x7e, 0xef, - 0x37, 0x33, 0x2f, 0x70, 0xf0, 0xac, 0x40, 0xbe, 0xe6, 0x2c, 0x09, 0x71, 0x9a, 0xf1, 0x54, 0xa4, - 0x04, 0x76, 0x96, 0xc3, 0x7b, 0x61, 0x24, 0x96, 0xc5, 0x7c, 0xba, 0x48, 0xe3, 0x59, 0x98, 0x86, - 0xe9, 0x4c, 0x85, 0xcc, 0x8b, 0x1f, 0x94, 0xa6, 0x14, 0x25, 0xe9, 0xd4, 0x43, 0x27, 0x4c, 0xd3, - 0x70, 0x85, 0xbb, 0xa8, 0xa0, 0xe0, 0x4c, 0x44, 0x69, 0x52, 0xfb, 0x4f, 0x5a, 0xe5, 0x16, 0x29, - 0x17, 0xf8, 0x3c, 0xe3, 0xe9, 0x13, 0x5c, 0x88, 0x5a, 0x9b, 0x65, 0x4f, 0xc3, 0x59, 0x94, 0x84, - 0x98, 0x0b, 0xe4, 0xb3, 0xc5, 0x2a, 0xc2, 0xa4, 0x71, 0xd5, 0x15, 0xc6, 0xd7, 0x3b, 0xb0, 0x64, - 0xad, 0x5d, 0xde, 0x8b, 0x3d, 0xb8, 0xf5, 0x88, 0xa7, 0x31, 0x8a, 0x25, 0x16, 0x39, 0xc5, 0x67, - 0x05, 0xe6, 0x82, 0x10, 0x30, 0x33, 0x26, 0x96, 0xb6, 0x31, 0x31, 0x8e, 0x86, 0x54, 0xc9, 0xe4, - 0x0e, 0xf4, 0x72, 0xc1, 0xb8, 0xb0, 0xf7, 0x26, 0xc6, 0x51, 0x97, 0x6a, 0x85, 0x1c, 0x40, 0x17, - 0x93, 0xc0, 0xee, 0x2a, 0x9b, 0x14, 0x65, 0x6e, 0x2e, 0x30, 0xb3, 0x4d, 0x65, 0x52, 0x32, 0xf9, - 0x04, 0xfa, 0x22, 0x8a, 0x31, 0x2d, 0x84, 0xdd, 0x9b, 0x18, 0x47, 0xfb, 0xc7, 0xe3, 0xa9, 0x86, - 0x34, 0x6d, 0x20, 0x4d, 0x1f, 0xd4, 0x43, 0xfb, 0x83, 0x97, 0xa5, 0xdb, 0xf9, 0xf5, 0x6f, 0xd7, - 0xa0, 0x4d, 0x8e, 0x6c, 0xad, 0xe8, 0xb5, 0x2d, 0x85, 0x47, 0x2b, 0xe4, 0x21, 0x8c, 0x16, 0x6c, - 0xb1, 0x8c, 0x92, 0xf0, 0x9b, 0x4c, 0x66, 0xe6, 0x76, 0x5f, 0xd5, 0x3e, 0x9c, 0xb6, 0x4e, 0xe7, - 0xb3, 0x2b, 0x11, 0xbe, 0x29, 0x8b, 0xd3, 0x6b, 0x79, 0xde, 0x63, 0xb0, 0xdb, 0x1c, 0xe4, 0x59, - 0x9a, 0xe4, 0xf8, 0x10, 0x59, 0x80, 0x9c, 0x8c, 0xc1, 0xfc, 0x9a, 0xc5, 0xa8, 0xa9, 0xf0, 0x7b, - 0x55, 0xe9, 0x1a, 0xf7, 0xa8, 0x99, 0xb0, 0x18, 0xc9, 0x7b, 0x60, 0x7d, 0xcb, 0x56, 0x05, 0xe6, - 0xf6, 0xde, 0xa4, 0xbb, 0x73, 0x5a, 0x3f, 0x2a, 0xa3, 0xf7, 0xfb, 0x1e, 0x90, 0x37, 0xcb, 0x12, - 0x0f, 0xac, 0x33, 0xc1, 0x44, 0x91, 0xd7, 0x25, 0xa1, 0x2a, 0x5d, 0x2b, 0x57, 0x16, 0x5a, 0x7f, - 0xc9, 0xe7, 0x60, 0x3e, 0x60, 0x82, 0x29, 0xaa, 0xaf, 0x0d, 0xb4, 0xab, 0x28, 0x23, 0xfc, 0x77, - 0xe4, 0x40, 0x55, 0xe9, 0x8e, 0x02, 0x26, 0xd8, 0xdd, 0x34, 0x8e, 0x04, 0xc6, 0x99, 0x58, 0x53, - 0x53, 0xea, 0xe4, 0x23, 0x18, 0x9e, 0x72, 0x9e, 0xf2, 0xc7, 0xeb, 0x0c, 0xd5, 0x19, 0x0d, 0xfd, - 0x77, 0xab, 0xd2, 0xbd, 0x8d, 0x8d, 0xb1, 0x95, 0x31, 0xdc, 0x1a, 0xc9, 0x07, 0xd0, 0x53, 0x69, - 0xea, 0x0c, 0x87, 0xfe, 0xed, 0xaa, 0x74, 0x6f, 0x2a, 0x6f, 0x2b, 0xbc, 0xa7, 0x0c, 0xe4, 0x14, - 0xfa, 0x9a, 0xa8, 0xdc, 0xee, 0x4d, 0xba, 0x47, 0xfb, 0xc7, 0xef, 0xff, 0x3f, 0xd8, 0xab, 0xac, - 0x36, 0x54, 0xf5, 0x97, 0x3a, 0xd7, 0x7b, 0x61, 0xc0, 0xe8, 0xea, 0x64, 0x64, 0x0a, 0x40, 0x31, - 0x2f, 0x56, 0x42, 0x81, 0xd7, 0x5c, 0x8d, 0xaa, 0xd2, 0x05, 0xbe, 0xb5, 0xd2, 0x96, 0x4c, 0x4e, - 0xc0, 0xd2, 0xf1, 0xea, 0x34, 0xf6, 0x8f, 0xed, 0x36, 0x90, 0x33, 0x16, 0x67, 0x2b, 0x3c, 0x13, - 0x1c, 0x59, 0xec, 0x8f, 0x6a, 0xce, 0x2c, 0x9d, 0x4d, 0xeb, 0xaf, 0xf7, 0xa7, 0x01, 0x37, 0xda, - 0x81, 0xe4, 0x27, 0xb0, 0x56, 0x6c, 0x8e, 0x2b, 0x79, 0x54, 0xb2, 0xe4, 0xad, 0x69, 0xfd, 0xac, - 0xbe, 0x92, 0xd6, 0x47, 0x2c, 0xe2, 0x3e, 0x95, 0xb5, 0xfe, 0x2a, 0xdd, 0xb7, 0x79, 0xa4, 0xba, - 0xcc, 0xfd, 0x80, 0x65, 0x02, 0xb9, 0xc4, 0x13, 0xa3, 0xe0, 0xd1, 0x82, 0xd6, 0x4d, 0xc9, 0xc7, - 0xd0, 0xcf, 0x15, 0x9c, 0xbc, 0x1e, 0x69, 0xd4, 0xf4, 0xd7, 0x28, 0x77, 0x83, 0xe8, 0x1b, 0x47, - 0x9b, 0x70, 0xef, 0x09, 0x8c, 0xe4, 0xc5, 0xc7, 0x60, 0x7b, 0xeb, 0xc6, 0xd0, 0x7d, 0x8a, 0xeb, - 0x9a, 0xc6, 0x7e, 0x55, 0xba, 0x52, 0xa5, 0xf2, 0x47, 0x3e, 0x4e, 0x7c, 0x2e, 0x30, 0x11, 0x4d, - 0x1b, 0xd2, 0x66, 0xee, 0x54, 0xb9, 0xfc, 0x9b, 0x75, 0xab, 0x26, 0x94, 0x36, 0x82, 0xf7, 0x87, - 0x01, 0x96, 0x0e, 0x22, 0x6e, 0xb3, 0x22, 0x64, 0x9b, 0xae, 0x3f, 0xac, 0x4a, 0x57, 0x1b, 0x9a, - 0x6d, 0x31, 0xd6, 0xdb, 0x42, 0x6d, 0x10, 0x8d, 0x02, 0x93, 0x40, 0xaf, 0x8d, 0x09, 0x0c, 0x04, - 0x67, 0x0b, 0xfc, 0x3e, 0x0a, 0xea, 0x6b, 0xd7, 0xdc, 0x11, 0x65, 0xfe, 0x22, 0x20, 0x9f, 0xc2, - 0x80, 0xd7, 0xe3, 0xd4, 0x5b, 0xe4, 0xce, 0x1b, 0x5b, 0xe4, 0x7e, 0xb2, 0xf6, 0x6f, 0x54, 0xa5, - 0xbb, 0x8d, 0xa4, 0x5b, 0xe9, 0x4b, 0x73, 0xd0, 0x3d, 0x30, 0xbd, 0xbb, 0x9a, 0x9a, 0xdd, 0xeb, - 0x27, 0x87, 0x30, 0x08, 0xa2, 0x9c, 0xcd, 0x57, 0x18, 0x28, 0xe0, 0x03, 0xba, 0xd5, 0xfd, 0x93, - 0xf3, 0x0b, 0xa7, 0xf3, 0xea, 0xc2, 0xe9, 0xbc, 0xbe, 0x70, 0x8c, 0x9f, 0x37, 0x8e, 0xf1, 0xdb, - 0xc6, 0x31, 0x5e, 0x6e, 0x1c, 0xe3, 0x7c, 0xe3, 0x18, 0xff, 0x6c, 0x1c, 0xe3, 0xdf, 0x8d, 0xd3, - 0x79, 0xbd, 0x71, 0x8c, 0x5f, 0x2e, 0x9d, 0xce, 0xf9, 0xa5, 0xd3, 0x79, 0x75, 0xe9, 0x74, 0xbe, - 0x6b, 0xfd, 0x19, 0xcc, 0x2d, 0x85, 0xed, 0xc3, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x24, 0x32, - 0xd7, 0x62, 0x33, 0x06, 0x00, 0x00, + // 833 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x8e, 0x1b, 0x45, + 0x10, 0xf6, 0xac, 0xed, 0xb1, 0xdd, 0x1b, 0x39, 0x9b, 0x4e, 0x04, 0xe3, 0x95, 0x98, 0xb1, 0x46, + 0x1c, 0x16, 0x29, 0xb1, 0xa5, 0x45, 0x48, 0x5c, 0x40, 0x9b, 0x21, 0x8b, 0x02, 0x42, 0x10, 0xf5, + 0x46, 0x1c, 0xb8, 0xa0, 0xb6, 0xa7, 0x18, 0x4f, 0x32, 0x7f, 0xe9, 0xee, 0x41, 0xf1, 0x01, 0x09, + 0xe5, 0x09, 0x38, 0xf2, 0x08, 0x20, 0xf1, 0x1e, 0xe4, 0xb8, 0xc7, 0x88, 0xc3, 0xc0, 0x7a, 0x2f, + 0x68, 0x4e, 0x79, 0x04, 0xd4, 0x3f, 0x63, 0xcf, 0x6e, 0x38, 0xe5, 0x62, 0x75, 0x55, 0x7d, 0x55, + 0xf5, 0xd5, 0xd7, 0x3d, 0x65, 0x74, 0xf0, 0xac, 0x04, 0xb6, 0x66, 0x34, 0x8b, 0x60, 0x56, 0xb0, + 0x5c, 0xe4, 0x18, 0xed, 0x3c, 0x87, 0xf7, 0xa2, 0x58, 0xac, 0xca, 0xc5, 0x6c, 0x99, 0xa7, 0xf3, + 0x28, 0x8f, 0xf2, 0xb9, 0x82, 0x2c, 0xca, 0x1f, 0x94, 0xa5, 0x0c, 0x75, 0xd2, 0xa9, 0x87, 0x6e, + 0x94, 0xe7, 0x51, 0x02, 0x3b, 0x54, 0x58, 0x32, 0x2a, 0xe2, 0x3c, 0x33, 0xf1, 0x93, 0x56, 0xb9, + 0x65, 0xce, 0x04, 0x3c, 0x2f, 0x58, 0xfe, 0x04, 0x96, 0xc2, 0x58, 0xf3, 0xe2, 0x69, 0x34, 0x8f, + 0xb3, 0x08, 0xb8, 0x00, 0x36, 0x5f, 0x26, 0x31, 0x64, 0x4d, 0xc8, 0x54, 0x98, 0x5c, 0xef, 0x40, + 0xb3, 0xb5, 0x0e, 0xf9, 0x2f, 0xf6, 0xd0, 0xad, 0x47, 0x2c, 0x4f, 0x41, 0xac, 0xa0, 0xe4, 0x04, + 0x9e, 0x95, 0xc0, 0x05, 0xc6, 0xa8, 0x57, 0x50, 0xb1, 0x72, 0xac, 0xa9, 0x75, 0x34, 0x22, 0xea, + 0x8c, 0xef, 0xa0, 0x3e, 0x17, 0x94, 0x09, 0x67, 0x6f, 0x6a, 0x1d, 0x75, 0x89, 0x36, 0xf0, 0x01, + 0xea, 0x42, 0x16, 0x3a, 0x5d, 0xe5, 0x93, 0x47, 0x99, 0xcb, 0x05, 0x14, 0x4e, 0x4f, 0xb9, 0xd4, + 0x19, 0x7f, 0x82, 0x06, 0x22, 0x4e, 0x21, 0x2f, 0x85, 0xd3, 0x9f, 0x5a, 0x47, 0xfb, 0xc7, 0x93, + 0x99, 0xa6, 0x34, 0x6b, 0x28, 0xcd, 0x1e, 0x98, 0xa1, 0x83, 0xe1, 0xcb, 0xca, 0xeb, 0xfc, 0xfa, + 0xb7, 0x67, 0x91, 0x26, 0x47, 0xb6, 0x56, 0xf2, 0x3a, 0xb6, 0xe2, 0xa3, 0x0d, 0xfc, 0x10, 0x8d, + 0x97, 0x74, 0xb9, 0x8a, 0xb3, 0xe8, 0x9b, 0x42, 0x66, 0x72, 0x67, 0xa0, 0x6a, 0x1f, 0xce, 0x5a, + 0xb7, 0xf3, 0xd9, 0x15, 0x44, 0xd0, 0x93, 0xc5, 0xc9, 0xb5, 0x3c, 0xff, 0x31, 0x72, 0xda, 0x1a, + 0xf0, 0x22, 0xcf, 0x38, 0x3c, 0x04, 0x1a, 0x02, 0xc3, 0x13, 0xd4, 0xfb, 0x9a, 0xa6, 0xa0, 0xa5, + 0x08, 0xfa, 0x75, 0xe5, 0x59, 0xf7, 0x88, 0x72, 0xe1, 0xf7, 0x90, 0xfd, 0x2d, 0x4d, 0x4a, 0xe0, + 0xce, 0xde, 0xb4, 0xbb, 0x0b, 0x1a, 0xa7, 0xff, 0xfb, 0x1e, 0xc2, 0x6f, 0x96, 0xc5, 0x3e, 0xb2, + 0xcf, 0x04, 0x15, 0x25, 0x37, 0x25, 0x51, 0x5d, 0x79, 0x36, 0x57, 0x1e, 0x62, 0x22, 0xf8, 0x73, + 0xd4, 0x7b, 0x40, 0x05, 0x55, 0x52, 0x5f, 0x1b, 0x68, 0x57, 0x51, 0x22, 0x82, 0x77, 0xe4, 0x40, + 0x75, 0xe5, 0x8d, 0x43, 0x2a, 0xe8, 0xdd, 0x3c, 0x8d, 0x05, 0xa4, 0x85, 0x58, 0x13, 0x95, 0x8f, + 0x3f, 0x42, 0xa3, 0x53, 0xc6, 0x72, 0xf6, 0x78, 0x5d, 0x80, 0xba, 0xa3, 0x51, 0xf0, 0x6e, 0x5d, + 0x79, 0xb7, 0xa1, 0x71, 0xb6, 0x32, 0x76, 0x48, 0xfc, 0x01, 0xea, 0x2b, 0x43, 0xdd, 0xe1, 0x28, + 0xb8, 0x5d, 0x57, 0xde, 0x4d, 0x95, 0xd2, 0x82, 0x6b, 0x04, 0x3e, 0x45, 0x03, 0x2d, 0x14, 0x77, + 0xfa, 0xd3, 0xee, 0xd1, 0xfe, 0xf1, 0xfb, 0xff, 0x4f, 0xf6, 0xaa, 0xaa, 0x8d, 0x54, 0x4d, 0xae, + 0xff, 0xc2, 0x42, 0xe3, 0xab, 0x93, 0xe1, 0x19, 0x42, 0x04, 0x78, 0x99, 0x08, 0x45, 0x5e, 0x6b, + 0x35, 0xae, 0x2b, 0x0f, 0xb1, 0xad, 0x97, 0xb4, 0x10, 0xf8, 0x04, 0xd9, 0xda, 0x52, 0xb7, 0xb1, + 0x7f, 0xec, 0xb4, 0x89, 0x9c, 0xd1, 0xb4, 0x48, 0xe0, 0x4c, 0x30, 0xa0, 0x69, 0x30, 0x36, 0x9a, + 0xd9, 0xba, 0x12, 0x31, 0x79, 0xfe, 0x9f, 0x16, 0xba, 0xd1, 0x06, 0xe2, 0x9f, 0x90, 0x9d, 0xd0, + 0x05, 0x24, 0xf2, 0xaa, 0x64, 0xc9, 0x5b, 0x33, 0xf3, 0x59, 0x7d, 0x25, 0xbd, 0x8f, 0x68, 0xcc, + 0x02, 0x22, 0x6b, 0xfd, 0x55, 0x79, 0x6f, 0xf3, 0x91, 0xea, 0x32, 0xf7, 0x43, 0x5a, 0x08, 0x60, + 0x92, 0x4f, 0x0a, 0x82, 0xc5, 0x4b, 0x62, 0x9a, 0xe2, 0x8f, 0xd1, 0x80, 0x2b, 0x3a, 0xdc, 0x8c, + 0x34, 0x6e, 0xfa, 0x6b, 0x96, 0xbb, 0x41, 0x7e, 0x54, 0x2f, 0x8e, 0x34, 0x70, 0xff, 0x09, 0x1a, + 0xcb, 0x87, 0x0f, 0xe1, 0xf6, 0xd5, 0x4d, 0x50, 0xf7, 0x29, 0xac, 0x8d, 0x8c, 0x83, 0xba, 0xf2, + 0xa4, 0x49, 0xe4, 0x8f, 0xfc, 0x38, 0xe1, 0xb9, 0x80, 0x4c, 0x34, 0x6d, 0x70, 0x5b, 0xb9, 0x53, + 0x15, 0x0a, 0x6e, 0x9a, 0x56, 0x0d, 0x94, 0x34, 0x07, 0xff, 0x0f, 0x0b, 0xd9, 0x1a, 0x84, 0xbd, + 0x66, 0x45, 0xc8, 0x36, 0xdd, 0x60, 0x54, 0x57, 0x9e, 0x76, 0x34, 0xdb, 0x62, 0xa2, 0xb7, 0x85, + 0xda, 0x20, 0x9a, 0x05, 0x64, 0xa1, 0x5e, 0x1b, 0x53, 0x34, 0x14, 0x8c, 0x2e, 0xe1, 0xfb, 0x38, + 0x34, 0xcf, 0xae, 0x79, 0x23, 0xca, 0xfd, 0x45, 0x88, 0x3f, 0x45, 0x43, 0x66, 0xc6, 0x31, 0x5b, + 0xe4, 0xce, 0x1b, 0x5b, 0xe4, 0x7e, 0xb6, 0x0e, 0x6e, 0xd4, 0x95, 0xb7, 0x45, 0x92, 0xed, 0xe9, + 0xcb, 0xde, 0xb0, 0x7b, 0xd0, 0xf3, 0xef, 0x6a, 0x69, 0x76, 0x5f, 0x3f, 0x3e, 0x44, 0xc3, 0x30, + 0xe6, 0x74, 0x91, 0x40, 0xa8, 0x88, 0x0f, 0xc9, 0xd6, 0x0e, 0x4e, 0xce, 0x2f, 0xdc, 0xce, 0xab, + 0x0b, 0xb7, 0xf3, 0xfa, 0xc2, 0xb5, 0x7e, 0xde, 0xb8, 0xd6, 0x6f, 0x1b, 0xd7, 0x7a, 0xb9, 0x71, + 0xad, 0xf3, 0x8d, 0x6b, 0xfd, 0xb3, 0x71, 0xad, 0x7f, 0x37, 0x6e, 0xe7, 0xf5, 0xc6, 0xb5, 0x7e, + 0xb9, 0x74, 0x3b, 0xe7, 0x97, 0x6e, 0xe7, 0xd5, 0xa5, 0xdb, 0xf9, 0xae, 0xf5, 0x67, 0xb0, 0xb0, + 0x15, 0xb7, 0x0f, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x19, 0x3b, 0xc7, 0x4d, 0x33, 0x06, 0x00, + 0x00, } func (this *PrometheusRequest) Equal(that interface{}) bool { From 4519719804dc14cae6369151b499dd426ac8c54e Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Mon, 12 Oct 2020 14:22:50 +0200 Subject: [PATCH 3/3] Removed 'Checkout version' note from GitHub actions workflow doc Signed-off-by: Marco Pracucci --- .github/README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/README.md b/.github/README.md index 867f22aee27..8384e6014cd 100644 --- a/.github/README.md +++ b/.github/README.md @@ -43,15 +43,6 @@ Each step in a job has a clear name that encapsulates the purpose of the command # commands ``` -**Checkout Version** - -Current build-image ships with an older version of Git which breaks github/actions@v2 so we are using actions/checkout@v1 for all jobs until the quay image is updated to ship with a more recent version of Git. - -```yaml -- name: Checkout Repo - uses: actions/checkout@v1 -``` - **Symbolic Link to Expected Workspace** A significant number of commands in the Makefile are hardcoded with an assumed file structure of the CI container. To ensure paths specified in previous commands don’t break, a symlink was created from the hardcoded “expected” working directory `/go/src/github.com/cortexproject/cortex` to the actual working directory `$GITHUB_WORKSPACE`.