From 80cd317b3b259680b937f507b5b016f43455b0d0 Mon Sep 17 00:00:00 2001 From: palashgdev Date: Tue, 28 Feb 2023 11:03:02 +0530 Subject: [PATCH 01/29] feat: color encoding is added in the logs raw view (#2398) * chore: some of the changes are updated * feat: ansi-to-html is added * feat: color is added in the raw view --- frontend/package.json | 3 ++ .../src/components/Logs/RawLogView/config.ts | 6 +--- .../src/components/Logs/RawLogView/index.tsx | 35 +++++++++++++------ .../src/components/Logs/RawLogView/styles.ts | 22 ++++++++++++ 4 files changed, 51 insertions(+), 15 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 0f731c45f1..24e883bb8b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,6 +32,7 @@ "@grafana/data": "^8.4.3", "@monaco-editor/react": "^4.3.1", "@xstate/react": "^3.0.0", + "ansi-to-html": "0.7.2", "antd": "5.0.5", "axios": "^0.21.0", "babel-eslint": "^10.1.0", @@ -51,6 +52,7 @@ "d3-flame-graph": "^3.1.1", "d3-tip": "^0.9.1", "dayjs": "^1.10.7", + "dompurify": "3.0.0", "dotenv": "8.2.0", "event-source-polyfill": "1.0.31", "file-loader": "6.1.1", @@ -126,6 +128,7 @@ "@types/copy-webpack-plugin": "^8.0.1", "@types/d3": "^6.2.0", "@types/d3-tip": "^3.5.5", + "@types/dompurify": "^2.4.0", "@types/event-source-polyfill": "^1.0.0", "@types/flat": "^5.0.2", "@types/fontfaceobserver": "2.1.0", diff --git a/frontend/src/components/Logs/RawLogView/config.ts b/frontend/src/components/Logs/RawLogView/config.ts index 66adeae252..e2f385a6b1 100644 --- a/frontend/src/components/Logs/RawLogView/config.ts +++ b/frontend/src/components/Logs/RawLogView/config.ts @@ -1,5 +1 @@ -export const rawLineStyle: React.CSSProperties = { - marginBottom: 0, - fontFamily: "'Fira Code', monospace", - fontWeight: 300, -}; +export const rawLineStyle: React.CSSProperties = {}; diff --git a/frontend/src/components/Logs/RawLogView/index.tsx b/frontend/src/components/Logs/RawLogView/index.tsx index 9cfafc5bd3..f3ddde84c7 100644 --- a/frontend/src/components/Logs/RawLogView/index.tsx +++ b/frontend/src/components/Logs/RawLogView/index.tsx @@ -1,15 +1,22 @@ import { ExpandAltOutlined } from '@ant-design/icons'; -import { Typography } from 'antd'; +// const Convert = require('ansi-to-html'); +import Convert from 'ansi-to-html'; import dayjs from 'dayjs'; +import dompurify from 'dompurify'; // hooks import { useIsDarkMode } from 'hooks/useDarkMode'; import React, { useCallback, useMemo } from 'react'; // interfaces import { ILog } from 'types/api/logs/log'; -import { rawLineStyle } from './config'; // styles -import { ExpandIconWrapper, RawLogViewContainer } from './styles'; +import { + ExpandIconWrapper, + RawLogContent, + RawLogViewContainer, +} from './styles'; + +const convert = new Convert(); interface RawLogViewProps { data: ILog; @@ -27,20 +34,28 @@ function RawLogView(props: RawLogViewProps): JSX.Element { [data.timestamp, data.body], ); - const ellipsis = useMemo(() => ({ rows: linesPerRow }), [linesPerRow]); - const handleClickExpand = useCallback(() => { onClickExpand(data); }, [onClickExpand, data]); + const html = useMemo( + () => ({ + __html: convert.toHtml(dompurify.sanitize(text)), + }), + [text], + ); + return ( - - + + - - {text} - + ); } diff --git a/frontend/src/components/Logs/RawLogView/styles.ts b/frontend/src/components/Logs/RawLogView/styles.ts index 19163adc07..dc42c60d33 100644 --- a/frontend/src/components/Logs/RawLogView/styles.ts +++ b/frontend/src/components/Logs/RawLogView/styles.ts @@ -22,3 +22,25 @@ export const ExpandIconWrapper = styled(Col)` cursor: pointer; font-size: 12px; `; + +interface RawLogContentProps { + linesPerRow: number; +} + +export const RawLogContent = styled.div` + margin-bottom: 0; + font-family: Fira Code, monospace; + font-weight: 300; + + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: ${(props): number => props.linesPerRow}; + line-clamp: ${(props): number => props.linesPerRow}; + -webkit-box-orient: vertical; + + font-size: 1rem; + line-height: 2rem; + + cursor: pointer; +`; From b0d5b1533065d44af143c766927598c196641eef Mon Sep 17 00:00:00 2001 From: Mary Ojo <38431519+maryojo@users.noreply.github.com> Date: Tue, 28 Feb 2023 08:46:31 +0000 Subject: [PATCH 02/29] style: corrected the positioning of the charts tooltip (#2402) * style: corrected the positioning of the charts tooltip * style: stored value for pixel in variable * chore: logic is shifted to plugin --------- Co-authored-by: palashgdev --- .../src/components/Graph/Plugin/Tooltip.ts | 46 +++++++++++++++++++ frontend/src/components/Graph/index.tsx | 10 ++++ 2 files changed, 56 insertions(+) create mode 100644 frontend/src/components/Graph/Plugin/Tooltip.ts diff --git a/frontend/src/components/Graph/Plugin/Tooltip.ts b/frontend/src/components/Graph/Plugin/Tooltip.ts new file mode 100644 index 0000000000..0a37694609 --- /dev/null +++ b/frontend/src/components/Graph/Plugin/Tooltip.ts @@ -0,0 +1,46 @@ +import { + ActiveElement, + ChartTypeRegistry, + Point, + TooltipModel, + TooltipXAlignment, + TooltipYAlignment, +} from 'chart.js'; + +export function TooltipPosition( + this: TooltipModel, + _: readonly ActiveElement[], + eventPosition: Point, +): ITooltipPosition { + const { + chartArea: { width }, + scales: { x, y }, + } = this.chart; + + const valueForPixelOnX = Number(x.getValueForPixel(eventPosition.x)); + const valueForPixelonY = Number(y.getValueForPixel(eventPosition.y)); + + const rightmostWidth = this.width + x.getPixelForValue(valueForPixelOnX) + 20; + + if (rightmostWidth > width) { + return { + x: x.getPixelForValue(valueForPixelOnX) - 20, + y: y.getPixelForValue(valueForPixelonY) + 10, + xAlign: 'right', + yAlign: 'top', + }; + } + return { + x: x.getPixelForValue(valueForPixelOnX) + 20, + y: y.getPixelForValue(valueForPixelonY) + 10, + xAlign: 'left', + yAlign: 'top', + }; +} + +interface ITooltipPosition { + x: number; + y: number; + xAlign: TooltipXAlignment; + yAlign: TooltipYAlignment; +} diff --git a/frontend/src/components/Graph/index.tsx b/frontend/src/components/Graph/index.tsx index 8bc8ee4109..527510f764 100644 --- a/frontend/src/components/Graph/index.tsx +++ b/frontend/src/components/Graph/index.tsx @@ -44,6 +44,7 @@ import { intersectionCursorPluginId, IntersectionCursorPluginOptions, } from './Plugin/IntersectionCursor'; +import { TooltipPosition as TooltipPositionHandler } from './Plugin/Tooltip'; import { LegendsContainer } from './styles'; import { useXAxisTimeUnit } from './xAxisConfig'; import { getToolTipValue, getYAxisFormattedValue } from './yAxisConfig'; @@ -67,6 +68,8 @@ Chart.register( annotationPlugin, ); +Tooltip.positioners.custom = TooltipPositionHandler; + function Graph({ animate = true, data, @@ -177,6 +180,7 @@ function Graph({ return 'rgba(255, 255, 255, 0.75)'; }, }, + position: 'custom', }, [dragSelectPluginId]: createDragSelectPluginOptions( !!onDragSelect, @@ -324,6 +328,12 @@ function Graph({ ); } +declare module 'chart.js' { + interface TooltipPositionerMap { + custom: TooltipPositionerFunction; + } +} + type CustomChartOptions = ChartOptions & { plugins: { [dragSelectPluginId]: DragSelectPluginOptions | false; From 995e45713cb1bb204b8e257f276dae199cee1dc9 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Tue, 28 Feb 2023 23:42:21 +0530 Subject: [PATCH 03/29] chore: health endpoint related changes (#2275) --- .../clickhouse-setup/docker-compose.yaml | 2 +- .../docker-compose-local.yaml | 2 +- .../clickhouse-setup/docker-compose.yaml | 2 +- pkg/query-service/app/http_handler.go | 2 +- pkg/query-service/model/response.go | 27 ++++++++++--------- pkg/query-service/telemetry/ignored.go | 2 +- pkg/query-service/tests/docker.go | 2 +- .../tests/test-deploy/docker-compose.yaml | 2 +- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index bee9c700f5..761cf9a589 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -156,7 +156,7 @@ services: - TELEMETRY_ENABLED=true - DEPLOYMENT_TYPE=docker-swarm healthcheck: - test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 diff --git a/deploy/docker/clickhouse-setup/docker-compose-local.yaml b/deploy/docker/clickhouse-setup/docker-compose-local.yaml index d5747c8e9d..b4c7cfca7e 100644 --- a/deploy/docker/clickhouse-setup/docker-compose-local.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose-local.yaml @@ -28,7 +28,7 @@ services: - "8080:8080" restart: on-failure healthcheck: - test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 37bc2c40c1..b3fd9c242a 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -174,7 +174,7 @@ services: - DEPLOYMENT_TYPE=docker-standalone-amd restart: on-failure healthcheck: - test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index 130d11e368..06de321612 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -1704,7 +1704,7 @@ func (aH *APIHandler) getHealth(w http.ResponseWriter, r *http.Request) { if ok { err := aH.reader.CheckClickHouse(r.Context()) if err != nil { - aH.HandleError(w, err, http.StatusServiceUnavailable) + RespondError(w, &model.ApiError{Err: err, Typ: model.ErrorStatusServiceUnavailable}, nil) return } } diff --git a/pkg/query-service/model/response.go b/pkg/query-service/model/response.go index 8aa815bc19..716f09f91b 100644 --- a/pkg/query-service/model/response.go +++ b/pkg/query-service/model/response.go @@ -49,19 +49,20 @@ func (a *ApiError) IsNil() bool { type ErrorType string const ( - ErrorNone ErrorType = "" - ErrorTimeout ErrorType = "timeout" - ErrorCanceled ErrorType = "canceled" - ErrorExec ErrorType = "execution" - ErrorBadData ErrorType = "bad_data" - ErrorInternal ErrorType = "internal" - ErrorUnavailable ErrorType = "unavailable" - ErrorNotFound ErrorType = "not_found" - ErrorNotImplemented ErrorType = "not_implemented" - ErrorUnauthorized ErrorType = "unauthorized" - ErrorForbidden ErrorType = "forbidden" - ErrorConflict ErrorType = "conflict" - ErrorStreamingNotSupported ErrorType = "streaming is not supported" + ErrorNone ErrorType = "" + ErrorTimeout ErrorType = "timeout" + ErrorCanceled ErrorType = "canceled" + ErrorExec ErrorType = "execution" + ErrorBadData ErrorType = "bad_data" + ErrorInternal ErrorType = "internal" + ErrorUnavailable ErrorType = "unavailable" + ErrorNotFound ErrorType = "not_found" + ErrorNotImplemented ErrorType = "not_implemented" + ErrorUnauthorized ErrorType = "unauthorized" + ErrorForbidden ErrorType = "forbidden" + ErrorConflict ErrorType = "conflict" + ErrorStreamingNotSupported ErrorType = "streaming is not supported" + ErrorStatusServiceUnavailable ErrorType = "service unavailable" ) // BadRequest returns a ApiError object of bad request diff --git a/pkg/query-service/telemetry/ignored.go b/pkg/query-service/telemetry/ignored.go index e0faad4461..6ffacba848 100644 --- a/pkg/query-service/telemetry/ignored.go +++ b/pkg/query-service/telemetry/ignored.go @@ -6,7 +6,7 @@ func IgnoredPaths() map[string]struct{} { "/api/v1/version": {}, "/api/v1/query_range": {}, "/api/v2/metrics/query_range": {}, - "/api/v1/services/list": {}, + "/api/v1/health": {}, } return ignoredPaths diff --git a/pkg/query-service/tests/docker.go b/pkg/query-service/tests/docker.go index da2c07f775..a710161a0e 100644 --- a/pkg/query-service/tests/docker.go +++ b/pkg/query-service/tests/docker.go @@ -90,7 +90,7 @@ func startCluster() error { client := http.Client{} for i := 0; i < 10; i++ { - if _, err := client.Get("http://localhost:8180/api/v1/version"); err != nil { + if _, err := client.Get("http://localhost:8180/api/v1/health"); err != nil { time.Sleep(2 * time.Second) } else { log.Printf("CLUSTER UP\n") diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml index 3bde538611..e604a12c05 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -162,7 +162,7 @@ services: - DEPLOYMENT_TYPE=docker-standalone-amd restart: on-failure healthcheck: - test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/version"] + test: ["CMD", "wget", "--spider", "-q", "localhost:8080/api/v1/health"] interval: 30s timeout: 5s retries: 3 From 388ef9453ca1ddb1c6bed03b88b4acd42cab0a95 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Wed, 15 Feb 2023 01:34:22 +0530 Subject: [PATCH 04/29] Add APIs for PAT --- ee/query-service/app/api/api.go | 5 ++ ee/query-service/app/api/pat.go | 78 +++++++++++++++++++++++++ ee/query-service/dao/interface.go | 7 ++- ee/query-service/dao/sqlite/modelDao.go | 12 +++- ee/query-service/dao/sqlite/pat.go | 44 ++++++++++++++ ee/query-service/model/pat.go | 10 ++++ 6 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 ee/query-service/app/api/pat.go create mode 100644 ee/query-service/dao/sqlite/pat.go create mode 100644 ee/query-service/model/pat.go diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go index 601bed7714..93330c0572 100644 --- a/ee/query-service/app/api/api.go +++ b/ee/query-service/app/api/api.go @@ -122,6 +122,11 @@ func (ah *APIHandler) RegisterRoutes(router *mux.Router) { router.HandleFunc("/api/v1/traces/{traceId}", baseapp.ViewAccess(ah.searchTraces)).Methods(http.MethodGet) router.HandleFunc("/api/v2/metrics/query_range", baseapp.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost) + // PAT APIs + router.HandleFunc("/api/v1/pat", baseapp.SelfAccess(ah.createPAT)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/pat", baseapp.SelfAccess(ah.getPATs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/pat/{id}", baseapp.SelfAccess(ah.deletePAT)).Methods(http.MethodDelete) + ah.APIHandler.RegisterRoutes(router) } diff --git a/ee/query-service/app/api/pat.go b/ee/query-service/app/api/pat.go new file mode 100644 index 0000000000..1b32ddfde5 --- /dev/null +++ b/ee/query-service/app/api/pat.go @@ -0,0 +1,78 @@ +package api + +import ( + "context" + "crypto/rand" + "encoding/base64" + "encoding/json" + "net/http" + "time" + + "github.com/gorilla/mux" + "go.signoz.io/signoz/ee/query-service/model" + "go.signoz.io/signoz/pkg/query-service/auth" + "go.uber.org/zap" +) + +func generatePATToken() string { + // Generate a 32-byte random token. + token := make([]byte, 32) + rand.Read(token) + // Encode the token in base64. + encodedToken := base64.StdEncoding.EncodeToString(token) + return encodedToken +} + +func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) { + ctx := context.Background() + + req := model.PAT{} + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + RespondError(w, model.BadRequest(err), nil) + return + } + user, err := auth.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + + req.UserID = user.Id + req.CreatedAt = time.Now().Unix() + req.Token = generatePATToken() + + zap.S().Infof("Got PAT request: %+v", req) + + if apierr := ah.AppDao().CreatePAT(ctx, &req); apierr != nil { + RespondError(w, apierr, nil) + return + } + + ah.Respond(w, &req) +} + +func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) { + ctx := context.Background() + user, _ := auth.GetUserFromRequest(r) + zap.S().Infof("Get PATs for user: %+v", user.Id) + pats, apierr := ah.AppDao().ListPATs(ctx, user.Id) + if apierr != nil { + RespondError(w, apierr, nil) + return + } + ah.WriteJSON(w, r, pats) +} + +func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) { + ctx := context.Background() + id := mux.Vars(r)["id"] + zap.S().Infof("Delete PAT with id: %+v", id) + if apierr := ah.AppDao().DeletePAT(ctx, id); apierr != nil { + RespondError(w, apierr, nil) + return + } + ah.WriteJSON(w, r, map[string]string{"data": "pat deleted successfully"}) +} diff --git a/ee/query-service/dao/interface.go b/ee/query-service/dao/interface.go index a2c9d9d68d..a74fa5c6f2 100644 --- a/ee/query-service/dao/interface.go +++ b/ee/query-service/dao/interface.go @@ -3,6 +3,7 @@ package dao import ( "context" "net/url" + "github.com/google/uuid" "github.com/jmoiron/sqlx" "go.signoz.io/signoz/ee/query-service/model" @@ -24,7 +25,7 @@ type ModelDao interface { CanUsePassword(ctx context.Context, email string) (bool, basemodel.BaseApiError) PrepareSsoRedirect(ctx context.Context, redirectUri, email string) (redirectURL string, apierr basemodel.BaseApiError) GetDomainFromSsoResponse(ctx context.Context, relayState *url.URL) (*model.OrgDomain, error) - + // org domain (auth domains) CRUD ops ListDomains(ctx context.Context, orgId string) ([]model.OrgDomain, basemodel.BaseApiError) GetDomain(ctx context.Context, id uuid.UUID) (*model.OrgDomain, basemodel.BaseApiError) @@ -32,4 +33,8 @@ type ModelDao interface { UpdateDomain(ctx context.Context, domain *model.OrgDomain) basemodel.BaseApiError DeleteDomain(ctx context.Context, id uuid.UUID) basemodel.BaseApiError GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError) + + CreatePAT(ctx context.Context, p *model.PAT) basemodel.BaseApiError + ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) + DeletePAT(ctx context.Context, id string) basemodel.BaseApiError } diff --git a/ee/query-service/dao/sqlite/modelDao.go b/ee/query-service/dao/sqlite/modelDao.go index 156f6b30e7..9b1d74c034 100644 --- a/ee/query-service/dao/sqlite/modelDao.go +++ b/ee/query-service/dao/sqlite/modelDao.go @@ -48,7 +48,17 @@ func InitDB(dataSourceName string) (*modelDao, error) { updated_at INTEGER, data TEXT NOT NULL, FOREIGN KEY(org_id) REFERENCES organizations(id) - );` + ); + CREATE TABLE IF NOT EXISTS personal_access_tokens ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id TEXT NOT NULL, + token TEXT NOT NULL, + name TEXT NOT NULL, + created_at INTEGER NOT NULL, + expires_at INTEGER NOT NULL, + FOREIGN KEY(user_id) REFERENCES users(id) + ); + ` _, err = m.DB().Exec(table_schema) if err != nil { diff --git a/ee/query-service/dao/sqlite/pat.go b/ee/query-service/dao/sqlite/pat.go new file mode 100644 index 0000000000..340af1f854 --- /dev/null +++ b/ee/query-service/dao/sqlite/pat.go @@ -0,0 +1,44 @@ +package sqlite + +import ( + "context" + "fmt" + + "go.signoz.io/signoz/ee/query-service/model" + basemodel "go.signoz.io/signoz/pkg/query-service/model" + "go.uber.org/zap" +) + +func (m *modelDao) CreatePAT(ctx context.Context, p *model.PAT) basemodel.BaseApiError { + _, err := m.DB().ExecContext(ctx, + "INSERT INTO personal_access_tokens (user_id, token, name, created_at, expires_at) VALUES ($1, $2, $3, $4, $5)", + p.UserID, + p.Token, + p.Name, + p.CreatedAt, + p.ExpiresAt) + if err != nil { + zap.S().Errorf("Failed to insert PAT in db, err: %v", zap.Error(err)) + return model.InternalError(fmt.Errorf("PAT insertion failed")) + } + return nil +} + +func (m *modelDao) ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) { + pats := []model.PAT{} + + if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE user_id=?;`, userID); err != nil { + zap.S().Errorf("Failed to fetch PATs for user: %s, err: %v", userID, zap.Error(err)) + return nil, model.InternalError(fmt.Errorf("Failed to fetch PATs")) + } + return pats, nil +} + +func (m *modelDao) DeletePAT(ctx context.Context, id string) basemodel.BaseApiError { + _, err := m.DB().ExecContext(ctx, `DELETE from personal_access_tokens where id=?;`, id) + if err != nil { + zap.S().Errorf("Failed to delete PAT, err: %v", zap.Error(err)) + return model.InternalError(fmt.Errorf("Failed to delete PAT")) + } + return nil +} diff --git a/ee/query-service/model/pat.go b/ee/query-service/model/pat.go new file mode 100644 index 0000000000..f320d0be7c --- /dev/null +++ b/ee/query-service/model/pat.go @@ -0,0 +1,10 @@ +package model + +type PAT struct { + Id string `json:"id" db:"id"` + UserID string `json:"userId" db:"user_id"` + Token string `json:"token" db:"token"` + Name string `json:"name" db:"name"` + CreatedAt int64 `json:"createdAt" db:"created_at"` + ExpiresAt int64 `json:"expiresAt" db:"expires_at"` +} From 96267e2e3a28d1f59fb69220aa10defdf7ecd717 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Wed, 15 Feb 2023 11:13:33 +0530 Subject: [PATCH 05/29] Add GetPAT function --- ee/query-service/app/api/pat.go | 1 - ee/query-service/dao/interface.go | 1 + ee/query-service/dao/sqlite/pat.go | 22 ++++++++++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ee/query-service/app/api/pat.go b/ee/query-service/app/api/pat.go index 1b32ddfde5..7c6052cffb 100644 --- a/ee/query-service/app/api/pat.go +++ b/ee/query-service/app/api/pat.go @@ -45,7 +45,6 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) { req.Token = generatePATToken() zap.S().Infof("Got PAT request: %+v", req) - if apierr := ah.AppDao().CreatePAT(ctx, &req); apierr != nil { RespondError(w, apierr, nil) return diff --git a/ee/query-service/dao/interface.go b/ee/query-service/dao/interface.go index a74fa5c6f2..5bb7c02412 100644 --- a/ee/query-service/dao/interface.go +++ b/ee/query-service/dao/interface.go @@ -35,6 +35,7 @@ type ModelDao interface { GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError) CreatePAT(ctx context.Context, p *model.PAT) basemodel.BaseApiError + GetPAT(ctx context.Context, patID string) (*model.PAT, basemodel.BaseApiError) ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) DeletePAT(ctx context.Context, id string) basemodel.BaseApiError } diff --git a/ee/query-service/dao/sqlite/pat.go b/ee/query-service/dao/sqlite/pat.go index 340af1f854..fc3c406ecb 100644 --- a/ee/query-service/dao/sqlite/pat.go +++ b/ee/query-service/dao/sqlite/pat.go @@ -29,7 +29,7 @@ func (m *modelDao) ListPATs(ctx context.Context, userID string) ([]model.PAT, ba if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE user_id=?;`, userID); err != nil { zap.S().Errorf("Failed to fetch PATs for user: %s, err: %v", userID, zap.Error(err)) - return nil, model.InternalError(fmt.Errorf("Failed to fetch PATs")) + return nil, model.InternalError(fmt.Errorf("failed to fetch PATs")) } return pats, nil } @@ -38,7 +38,25 @@ func (m *modelDao) DeletePAT(ctx context.Context, id string) basemodel.BaseApiEr _, err := m.DB().ExecContext(ctx, `DELETE from personal_access_tokens where id=?;`, id) if err != nil { zap.S().Errorf("Failed to delete PAT, err: %v", zap.Error(err)) - return model.InternalError(fmt.Errorf("Failed to delete PAT")) + return model.InternalError(fmt.Errorf("failed to delete PAT")) } return nil } + +func (m *modelDao) GetPAT(ctx context.Context, patID string) (*model.PAT, basemodel.BaseApiError) { + pats := []model.PAT{} + + if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE id=?;`, patID); err != nil { + zap.S().Errorf("Failed to fetch PAT with ID: %s, err: %v", patID, zap.Error(err)) + return nil, model.InternalError(fmt.Errorf("failed to fetch PAT")) + } + + if len(pats) != 1 { + return nil, &model.ApiError{ + Typ: model.ErrorInternal, + Err: fmt.Errorf("found zero or multiple PATS with same ID"), + } + } + + return &pats[0], nil +} From 797352583a4266eeec7a0b479c7fff4a5648dcb1 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Wed, 15 Feb 2023 23:49:03 +0530 Subject: [PATCH 06/29] Create PAT supporting auth middleware --- ee/query-service/app/api/api.go | 42 ++--- ee/query-service/app/api/pat.go | 30 ++- ee/query-service/app/server.go | 53 +++++- ee/query-service/dao/interface.go | 2 +- ee/query-service/dao/sqlite/pat.go | 7 +- pkg/query-service/app/auth.go | 116 ++++++++++++ pkg/query-service/app/http_handler.go | 253 ++++++++------------------ pkg/query-service/app/server.go | 9 +- pkg/query-service/auth/rbac.go | 14 ++ 9 files changed, 320 insertions(+), 206 deletions(-) create mode 100644 pkg/query-service/app/auth.go diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go index 93330c0572..42410b65e7 100644 --- a/ee/query-service/app/api/api.go +++ b/ee/query-service/app/api/api.go @@ -69,65 +69,65 @@ func (ah *APIHandler) CheckFeature(f string) bool { } // RegisterRoutes registers routes for this handler on the given router -func (ah *APIHandler) RegisterRoutes(router *mux.Router) { +func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddleware) { // note: add ee override methods first // routes available only in ee version router.HandleFunc("/api/v1/licenses", - baseapp.AdminAccess(ah.listLicenses)). + am.AdminAccess(ah.listLicenses)). Methods(http.MethodGet) router.HandleFunc("/api/v1/licenses", - baseapp.AdminAccess(ah.applyLicense)). + am.AdminAccess(ah.applyLicense)). Methods(http.MethodPost) router.HandleFunc("/api/v1/featureFlags", - baseapp.OpenAccess(ah.getFeatureFlags)). + am.OpenAccess(ah.getFeatureFlags)). Methods(http.MethodGet) router.HandleFunc("/api/v1/loginPrecheck", - baseapp.OpenAccess(ah.precheckLogin)). + am.OpenAccess(ah.precheckLogin)). Methods(http.MethodGet) // paid plans specific routes router.HandleFunc("/api/v1/complete/saml", - baseapp.OpenAccess(ah.receiveSAML)). + am.OpenAccess(ah.receiveSAML)). Methods(http.MethodPost) router.HandleFunc("/api/v1/complete/google", - baseapp.OpenAccess(ah.receiveGoogleAuth)). + am.OpenAccess(ah.receiveGoogleAuth)). Methods(http.MethodGet) router.HandleFunc("/api/v1/orgs/{orgId}/domains", - baseapp.AdminAccess(ah.listDomainsByOrg)). + am.AdminAccess(ah.listDomainsByOrg)). Methods(http.MethodGet) router.HandleFunc("/api/v1/domains", - baseapp.AdminAccess(ah.postDomain)). + am.AdminAccess(ah.postDomain)). Methods(http.MethodPost) router.HandleFunc("/api/v1/domains/{id}", - baseapp.AdminAccess(ah.putDomain)). + am.AdminAccess(ah.putDomain)). Methods(http.MethodPut) router.HandleFunc("/api/v1/domains/{id}", - baseapp.AdminAccess(ah.deleteDomain)). + am.AdminAccess(ah.deleteDomain)). Methods(http.MethodDelete) // base overrides - router.HandleFunc("/api/v1/version", baseapp.OpenAccess(ah.getVersion)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/invite/{token}", baseapp.OpenAccess(ah.getInvite)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/register", baseapp.OpenAccess(ah.registerUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/login", baseapp.OpenAccess(ah.loginUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/traces/{traceId}", baseapp.ViewAccess(ah.searchTraces)).Methods(http.MethodGet) - router.HandleFunc("/api/v2/metrics/query_range", baseapp.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/version", am.OpenAccess(ah.getVersion)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/invite/{token}", am.OpenAccess(ah.getInvite)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/register", am.OpenAccess(ah.registerUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/login", am.OpenAccess(ah.loginUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(ah.searchTraces)).Methods(http.MethodGet) + router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost) // PAT APIs - router.HandleFunc("/api/v1/pat", baseapp.SelfAccess(ah.createPAT)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/pat", baseapp.SelfAccess(ah.getPATs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/pat/{id}", baseapp.SelfAccess(ah.deletePAT)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/pat", am.OpenAccess(ah.createPAT)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/pat", am.OpenAccess(ah.getPATs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/pat/{id}", am.OpenAccess(ah.deletePAT)).Methods(http.MethodDelete) - ah.APIHandler.RegisterRoutes(router) + ah.APIHandler.RegisterRoutes(router, am) } diff --git a/ee/query-service/app/api/pat.go b/ee/query-service/app/api/pat.go index 7c6052cffb..d708ba0606 100644 --- a/ee/query-service/app/api/pat.go +++ b/ee/query-service/app/api/pat.go @@ -5,6 +5,7 @@ import ( "crypto/rand" "encoding/base64" "encoding/json" + "fmt" "net/http" "time" @@ -55,7 +56,14 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) { func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) { ctx := context.Background() - user, _ := auth.GetUserFromRequest(r) + user, err := auth.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } zap.S().Infof("Get PATs for user: %+v", user.Id) pats, apierr := ah.AppDao().ListPATs(ctx, user.Id) if apierr != nil { @@ -68,6 +76,26 @@ func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) { func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) { ctx := context.Background() id := mux.Vars(r)["id"] + user, err := auth.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + pat, apierr := ah.AppDao().GetPAT(ctx, id) + if apierr != nil { + RespondError(w, apierr, nil) + return + } + if pat.UserID != user.Id { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: fmt.Errorf("unauthorized PAT delete request"), + }, nil) + return + } zap.S().Infof("Delete PAT with id: %+v", id) if apierr := ah.AppDao().DeletePAT(ctx, id); apierr != nil { RespondError(w, apierr, nil) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index f97f5e0da1..a634057531 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -10,6 +10,7 @@ import ( "net/http" _ "net/http/pprof" // http profiler "os" + "strings" "time" "github.com/gorilla/handlers" @@ -25,7 +26,9 @@ import ( licensepkg "go.signoz.io/signoz/ee/query-service/license" "go.signoz.io/signoz/ee/query-service/usage" + baseapp "go.signoz.io/signoz/pkg/query-service/app" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + baseauth "go.signoz.io/signoz/pkg/query-service/auth" baseconst "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/healthcheck" basealm "go.signoz.io/signoz/pkg/query-service/integrations/alertManager" @@ -199,17 +202,61 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, }, nil } +func getPATToken(r *http.Request) (string, error) { + authHeader := r.Header.Get("Authorization") + if authHeader == "" { + return "", nil + } + + authHeaderParts := strings.Fields(authHeader) + if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { + return "", fmt.Errorf("authorization header format must be Bearer {token}") + } + + return authHeaderParts[1], nil +} + func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, error) { r := mux.NewRouter() + getUserFromPAT := func(r *http.Request) (*model.UserPayload, error) { + patToken, err := getPATToken(r) + if err != nil { + return nil, fmt.Errorf("failed to get PAT token in request headers, err: %v", err) + } + ctx := context.Background() + dao := apiHandler.AppDao() + pat, err := dao.GetPAT(ctx, patToken) + if err != nil { + return nil, fmt.Errorf("failed to fetch PAT token from DB, err %v", err) + } + user, apierr := dao.GetUser(ctx, pat.UserID) + if apierr != nil { + return nil, fmt.Errorf("failed to fetch user for PAT from DB, err: %v", apierr) + } + return user, nil + } + + getUserFromRequest := func(r *http.Request) (*model.UserPayload, error) { + user, err := getUserFromPAT(r) + if err == nil && user != nil { + zap.S().Debugf("Found valid PAT user: %+v", user) + return user, nil + } + if err != nil { + zap.S().Debugf("Error while getting user for PAT: %+v", err) + } + return baseauth.GetUserFromRequest(r) + } + am := baseapp.NewAuthMiddleware(getUserFromRequest) r.Use(setTimeoutMiddleware) r.Use(s.analyticsMiddleware) r.Use(loggingMiddleware) - apiHandler.RegisterRoutes(r) - apiHandler.RegisterMetricsRoutes(r) - apiHandler.RegisterLogsRoutes(r) + apiHandler.RegisterRoutes(r, am) + apiHandler.RegisterMetricsRoutes(r, am) + apiHandler.RegisterLogsRoutes(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/ee/query-service/dao/interface.go b/ee/query-service/dao/interface.go index 5bb7c02412..da6963f68c 100644 --- a/ee/query-service/dao/interface.go +++ b/ee/query-service/dao/interface.go @@ -35,7 +35,7 @@ type ModelDao interface { GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError) CreatePAT(ctx context.Context, p *model.PAT) basemodel.BaseApiError - GetPAT(ctx context.Context, patID string) (*model.PAT, basemodel.BaseApiError) + GetPAT(ctx context.Context, pat string) (*model.PAT, basemodel.BaseApiError) ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) DeletePAT(ctx context.Context, id string) basemodel.BaseApiError } diff --git a/ee/query-service/dao/sqlite/pat.go b/ee/query-service/dao/sqlite/pat.go index fc3c406ecb..7b3569db66 100644 --- a/ee/query-service/dao/sqlite/pat.go +++ b/ee/query-service/dao/sqlite/pat.go @@ -43,18 +43,17 @@ func (m *modelDao) DeletePAT(ctx context.Context, id string) basemodel.BaseApiEr return nil } -func (m *modelDao) GetPAT(ctx context.Context, patID string) (*model.PAT, basemodel.BaseApiError) { +func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, basemodel.BaseApiError) { pats := []model.PAT{} - if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE id=?;`, patID); err != nil { - zap.S().Errorf("Failed to fetch PAT with ID: %s, err: %v", patID, zap.Error(err)) + if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE token=?;`, token); err != nil { return nil, model.InternalError(fmt.Errorf("failed to fetch PAT")) } if len(pats) != 1 { return nil, &model.ApiError{ Typ: model.ErrorInternal, - Err: fmt.Errorf("found zero or multiple PATS with same ID"), + Err: fmt.Errorf("found zero or multiple PATs with same token, %s", token), } } diff --git a/pkg/query-service/app/auth.go b/pkg/query-service/app/auth.go new file mode 100644 index 0000000000..ef6541a4f6 --- /dev/null +++ b/pkg/query-service/app/auth.go @@ -0,0 +1,116 @@ +package app + +import ( + "errors" + "net/http" + + "github.com/gorilla/mux" + "go.signoz.io/signoz/pkg/query-service/auth" + "go.signoz.io/signoz/pkg/query-service/model" +) + +type AuthMiddleware struct { + GetUserFromRequest func(r *http.Request) (*model.UserPayload, error) +} + +func NewAuthMiddleware(f func(r *http.Request) (*model.UserPayload, error)) *AuthMiddleware { + return &AuthMiddleware{ + GetUserFromRequest: f, + } +} + +// func (am *AuthMiddleware) GetUserFromRequest(r *http.Request) (*model.UserPayload, error) { +// return auth.GetUserFromRequest(r) +// } + +func (am *AuthMiddleware) OpenAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + f(w, r) + } +} + +func (am *AuthMiddleware) ViewAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + + if !(auth.IsViewer(user) || auth.IsEditor(user) || auth.IsAdmin(user)) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible to viewers/editors/admins."), + }, nil) + return + } + f(w, r) + } +} + +func (am *AuthMiddleware) EditAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + if !(auth.IsEditor(user) || auth.IsAdmin(user)) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible to editors/admins."), + }, nil) + return + } + f(w, r) + } +} + +func (am *AuthMiddleware) SelfAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + id := mux.Vars(r)["id"] + if !(auth.IsSelfAccessRequest(user, id) || auth.IsAdmin(user)) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible for self access or to the admins."), + }, nil) + return + } + f(w, r) + } +} + +func (am *AuthMiddleware) AdminAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + if !auth.IsAdmin(user) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible to admins only"), + }, nil) + return + } + f(w, r) + } +} diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index 06de321612..eeb324f149 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -229,202 +229,109 @@ func writeHttpResponse(w http.ResponseWriter, data interface{}) { } } -func (aH *APIHandler) RegisterMetricsRoutes(router *mux.Router) { +func (aH *APIHandler) RegisterMetricsRoutes(router *mux.Router, am *AuthMiddleware) { subRouter := router.PathPrefix("/api/v2/metrics").Subrouter() - subRouter.HandleFunc("/query_range", ViewAccess(aH.QueryRangeMetricsV2)).Methods(http.MethodPost) - subRouter.HandleFunc("/autocomplete/list", ViewAccess(aH.metricAutocompleteMetricName)).Methods(http.MethodGet) - subRouter.HandleFunc("/autocomplete/tagKey", ViewAccess(aH.metricAutocompleteTagKey)).Methods(http.MethodGet) - subRouter.HandleFunc("/autocomplete/tagValue", ViewAccess(aH.metricAutocompleteTagValue)).Methods(http.MethodGet) + subRouter.HandleFunc("/query_range", am.ViewAccess(aH.QueryRangeMetricsV2)).Methods(http.MethodPost) + subRouter.HandleFunc("/autocomplete/list", am.ViewAccess(aH.metricAutocompleteMetricName)).Methods(http.MethodGet) + subRouter.HandleFunc("/autocomplete/tagKey", am.ViewAccess(aH.metricAutocompleteTagKey)).Methods(http.MethodGet) + subRouter.HandleFunc("/autocomplete/tagValue", am.ViewAccess(aH.metricAutocompleteTagValue)).Methods(http.MethodGet) } func (aH *APIHandler) Respond(w http.ResponseWriter, data interface{}) { writeHttpResponse(w, data) } -func OpenAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - f(w, r) - } -} - -func ViewAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - - if !(auth.IsViewer(user) || auth.IsEditor(user) || auth.IsAdmin(user)) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible to viewers/editors/admins."), - }, nil) - return - } - f(w, r) - } -} - -func EditAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - if !(auth.IsEditor(user) || auth.IsAdmin(user)) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible to editors/admins."), - }, nil) - return - } - f(w, r) - } -} - -func SelfAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - id := mux.Vars(r)["id"] - if !(auth.IsSelfAccessRequest(user, id) || auth.IsAdmin(user)) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible for self access or to the admins."), - }, nil) - return - } - f(w, r) - } -} - -func AdminAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - if !auth.IsAdmin(user) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible to admins only"), - }, nil) - return - } - f(w, r) - } -} - // RegisterPrivateRoutes registers routes for this handler on the given router func (aH *APIHandler) RegisterPrivateRoutes(router *mux.Router) { router.HandleFunc("/api/v1/channels", aH.listChannels).Methods(http.MethodGet) } // RegisterRoutes registers routes for this handler on the given router -func (aH *APIHandler) RegisterRoutes(router *mux.Router) { - router.HandleFunc("/api/v1/query_range", ViewAccess(aH.queryRangeMetrics)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/query", ViewAccess(aH.queryMetrics)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/channels", ViewAccess(aH.listChannels)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/channels/{id}", ViewAccess(aH.getChannel)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/channels/{id}", AdminAccess(aH.editChannel)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/channels/{id}", AdminAccess(aH.deleteChannel)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/channels", EditAccess(aH.createChannel)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/testChannel", EditAccess(aH.testChannel)).Methods(http.MethodPost) +func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *AuthMiddleware) { + router.HandleFunc("/api/v1/query_range", am.ViewAccess(aH.queryRangeMetrics)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/query", am.ViewAccess(aH.queryMetrics)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/channels", am.ViewAccess(aH.listChannels)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/channels/{id}", am.ViewAccess(aH.getChannel)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/channels/{id}", am.AdminAccess(aH.editChannel)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/channels/{id}", am.AdminAccess(aH.deleteChannel)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/channels", am.EditAccess(aH.createChannel)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/testChannel", am.EditAccess(aH.testChannel)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/rules", ViewAccess(aH.listRules)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/rules/{id}", ViewAccess(aH.getRule)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/rules", EditAccess(aH.createRule)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/rules/{id}", EditAccess(aH.editRule)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/rules/{id}", EditAccess(aH.deleteRule)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/rules/{id}", EditAccess(aH.patchRule)).Methods(http.MethodPatch) - router.HandleFunc("/api/v1/testRule", EditAccess(aH.testRule)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/rules", am.ViewAccess(aH.listRules)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/rules/{id}", am.ViewAccess(aH.getRule)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/rules", am.EditAccess(aH.createRule)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.editRule)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.deleteRule)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.patchRule)).Methods(http.MethodPatch) + router.HandleFunc("/api/v1/testRule", am.EditAccess(aH.testRule)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/dashboards", ViewAccess(aH.getDashboards)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/dashboards", EditAccess(aH.createDashboards)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/dashboards/grafana", EditAccess(aH.createDashboardsTransform)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/dashboards/{uuid}", ViewAccess(aH.getDashboard)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/dashboards/{uuid}", EditAccess(aH.updateDashboard)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/dashboards/{uuid}", EditAccess(aH.deleteDashboard)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/variables/query", ViewAccess(aH.queryDashboardVars)).Methods(http.MethodGet) - router.HandleFunc("/api/v2/variables/query", ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/dashboards", am.ViewAccess(aH.getDashboards)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/dashboards", am.EditAccess(aH.createDashboards)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/dashboards/grafana", am.EditAccess(aH.createDashboardsTransform)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/dashboards/{uuid}", am.ViewAccess(aH.getDashboard)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/dashboards/{uuid}", am.EditAccess(aH.updateDashboard)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/dashboards/{uuid}", am.EditAccess(aH.deleteDashboard)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/variables/query", am.ViewAccess(aH.queryDashboardVars)).Methods(http.MethodGet) + router.HandleFunc("/api/v2/variables/query", am.ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/feedback", OpenAccess(aH.submitFeedback)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/feedback", am.OpenAccess(aH.submitFeedback)).Methods(http.MethodPost) // router.HandleFunc("/api/v1/get_percentiles", aH.getApplicationPercentiles).Methods(http.MethodGet) - router.HandleFunc("/api/v1/services", ViewAccess(aH.getServices)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/services/list", ViewAccess(aH.getServicesList)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/service/overview", ViewAccess(aH.getServiceOverview)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/service/top_operations", ViewAccess(aH.getTopOperations)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/service/top_level_operations", ViewAccess(aH.getServicesTopLevelOps)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/traces/{traceId}", ViewAccess(aH.SearchTraces)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/usage", ViewAccess(aH.getUsage)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/dependency_graph", ViewAccess(aH.dependencyGraph)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/settings/ttl", AdminAccess(aH.setTTL)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/settings/ttl", ViewAccess(aH.getTTL)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/services", am.ViewAccess(aH.getServices)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/services/list", am.ViewAccess(aH.getServicesList)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/service/overview", am.ViewAccess(aH.getServiceOverview)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/service/top_operations", am.ViewAccess(aH.getTopOperations)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/service/top_level_operations", am.ViewAccess(aH.getServicesTopLevelOps)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(aH.SearchTraces)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/usage", am.ViewAccess(aH.getUsage)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/dependency_graph", am.ViewAccess(aH.dependencyGraph)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/settings/ttl", am.AdminAccess(aH.setTTL)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/settings/ttl", am.ViewAccess(aH.getTTL)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/version", OpenAccess(aH.getVersion)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/featureFlags", OpenAccess(aH.getFeatureFlags)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/configs", OpenAccess(aH.getConfigs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/health", OpenAccess(aH.getHealth)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/version", am.OpenAccess(aH.getVersion)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/featureFlags", am.OpenAccess(aH.getFeatureFlags)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/configs", am.OpenAccess(aH.getConfigs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/getSpanFilters", ViewAccess(aH.getSpanFilters)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getTagFilters", ViewAccess(aH.getTagFilters)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getFilteredSpans", ViewAccess(aH.getFilteredSpans)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getFilteredSpans/aggregates", ViewAccess(aH.getFilteredSpanAggregates)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getTagValues", ViewAccess(aH.getTagValues)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getSpanFilters", am.ViewAccess(aH.getSpanFilters)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getTagFilters", am.ViewAccess(aH.getTagFilters)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getFilteredSpans", am.ViewAccess(aH.getFilteredSpans)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getFilteredSpans/aggregates", am.ViewAccess(aH.getFilteredSpanAggregates)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getTagValues", am.ViewAccess(aH.getTagValues)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/listErrors", ViewAccess(aH.listErrors)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/countErrors", ViewAccess(aH.countErrors)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/errorFromErrorID", ViewAccess(aH.getErrorFromErrorID)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/errorFromGroupID", ViewAccess(aH.getErrorFromGroupID)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/nextPrevErrorIDs", ViewAccess(aH.getNextPrevErrorIDs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/listErrors", am.ViewAccess(aH.listErrors)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/countErrors", am.ViewAccess(aH.countErrors)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/errorFromErrorID", am.ViewAccess(aH.getErrorFromErrorID)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/errorFromGroupID", am.ViewAccess(aH.getErrorFromGroupID)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/nextPrevErrorIDs", am.ViewAccess(aH.getNextPrevErrorIDs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/disks", ViewAccess(aH.getDisks)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/disks", am.ViewAccess(aH.getDisks)).Methods(http.MethodGet) // === Authentication APIs === - router.HandleFunc("/api/v1/invite", AdminAccess(aH.inviteUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/invite/{token}", OpenAccess(aH.getInvite)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/invite/{email}", AdminAccess(aH.revokeInvite)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/invite", AdminAccess(aH.listPendingInvites)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/invite", am.AdminAccess(aH.inviteUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/invite/{token}", am.OpenAccess(aH.getInvite)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/invite/{email}", am.AdminAccess(aH.revokeInvite)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/invite", am.AdminAccess(aH.listPendingInvites)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/register", OpenAccess(aH.registerUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/login", OpenAccess(aH.loginUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/register", am.OpenAccess(aH.registerUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/login", am.OpenAccess(aH.loginUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/user", AdminAccess(aH.listUsers)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/user/{id}", SelfAccess(aH.getUser)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/user/{id}", SelfAccess(aH.editUser)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/user/{id}", AdminAccess(aH.deleteUser)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/user", am.AdminAccess(aH.listUsers)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/user/{id}", am.SelfAccess(aH.getUser)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/user/{id}", am.SelfAccess(aH.editUser)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/user/{id}", am.AdminAccess(aH.deleteUser)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/user/{id}/flags", SelfAccess(aH.patchUserFlag)).Methods(http.MethodPatch) + router.HandleFunc("/api/v1/user/{id}/flags", am.SelfAccess(aH.patchUserFlag)).Methods(http.MethodPatch) - router.HandleFunc("/api/v1/rbac/role/{id}", SelfAccess(aH.getRole)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/rbac/role/{id}", AdminAccess(aH.editRole)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/rbac/role/{id}", am.SelfAccess(aH.getRole)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/rbac/role/{id}", am.AdminAccess(aH.editRole)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/org", AdminAccess(aH.getOrgs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/org/{id}", AdminAccess(aH.getOrg)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/org/{id}", AdminAccess(aH.editOrg)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/orgUsers/{id}", AdminAccess(aH.getOrgUsers)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/org", am.AdminAccess(aH.getOrgs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/org/{id}", am.AdminAccess(aH.getOrg)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/org/{id}", am.AdminAccess(aH.editOrg)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/orgUsers/{id}", am.AdminAccess(aH.getOrgUsers)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/getResetPasswordToken/{id}", AdminAccess(aH.getResetPasswordToken)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/resetPassword", OpenAccess(aH.resetPassword)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/changePassword/{id}", SelfAccess(aH.changePassword)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getResetPasswordToken/{id}", am.AdminAccess(aH.getResetPasswordToken)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/resetPassword", am.OpenAccess(aH.resetPassword)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/changePassword/{id}", am.SelfAccess(aH.changePassword)).Methods(http.MethodPost) } func Intersection(a, b []int) (c []int) { @@ -2221,13 +2128,13 @@ func (aH *APIHandler) WriteJSON(w http.ResponseWriter, r *http.Request, response } // logs -func (aH *APIHandler) RegisterLogsRoutes(router *mux.Router) { +func (aH *APIHandler) RegisterLogsRoutes(router *mux.Router, am *AuthMiddleware) { subRouter := router.PathPrefix("/api/v1/logs").Subrouter() - subRouter.HandleFunc("", ViewAccess(aH.getLogs)).Methods(http.MethodGet) - subRouter.HandleFunc("/tail", ViewAccess(aH.tailLogs)).Methods(http.MethodGet) - subRouter.HandleFunc("/fields", ViewAccess(aH.logFields)).Methods(http.MethodGet) - subRouter.HandleFunc("/fields", EditAccess(aH.logFieldUpdate)).Methods(http.MethodPost) - subRouter.HandleFunc("/aggregate", ViewAccess(aH.logAggregate)).Methods(http.MethodGet) + subRouter.HandleFunc("", am.ViewAccess(aH.getLogs)).Methods(http.MethodGet) + subRouter.HandleFunc("/tail", am.ViewAccess(aH.tailLogs)).Methods(http.MethodGet) + subRouter.HandleFunc("/fields", am.ViewAccess(aH.logFields)).Methods(http.MethodGet) + subRouter.HandleFunc("/fields", am.EditAccess(aH.logFieldUpdate)).Methods(http.MethodPost) + subRouter.HandleFunc("/aggregate", am.ViewAccess(aH.logAggregate)).Methods(http.MethodGet) } func (aH *APIHandler) logFields(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index c9505b9391..c99046fac4 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -20,6 +20,7 @@ import ( "github.com/soheilhy/cmux" "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + "go.signoz.io/signoz/pkg/query-service/auth" "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/dao" "go.signoz.io/signoz/pkg/query-service/featureManager" @@ -176,9 +177,11 @@ func (s *Server) createPublicServer(api *APIHandler) (*http.Server, error) { r.Use(s.analyticsMiddleware) r.Use(loggingMiddleware) - api.RegisterRoutes(r) - api.RegisterMetricsRoutes(r) - api.RegisterLogsRoutes(r) + am := NewAuthMiddleware(auth.GetUserFromRequest) + + api.RegisterRoutes(r, am) + api.RegisterMetricsRoutes(r, am) + api.RegisterLogsRoutes(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/pkg/query-service/auth/rbac.go b/pkg/query-service/auth/rbac.go index 44f65576ed..38ae283bb2 100644 --- a/pkg/query-service/auth/rbac.go +++ b/pkg/query-service/auth/rbac.go @@ -3,6 +3,7 @@ package auth import ( "context" "net/http" + "strings" "github.com/pkg/errors" "go.signoz.io/signoz/pkg/query-service/constants" @@ -48,6 +49,19 @@ func InitAuthCache(ctx context.Context) error { return nil } +func GetAuthorizationToken(r *http.Request) string { + authHeader := r.Header.Get("Authorization") + if authHeader == "" { + return "" + } + + authHeaderParts := strings.Fields(authHeader) + if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { + return "" + } + return authHeaderParts[1] +} + func GetUserFromRequest(r *http.Request) (*model.UserPayload, error) { accessJwt, err := ExtractJwtFromRequest(r) if err != nil { From b0f62daa2427a4485b0913a54d6f34e66c641ae3 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Wed, 15 Feb 2023 23:59:03 +0530 Subject: [PATCH 07/29] Cleanup rbac.go --- pkg/query-service/auth/rbac.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkg/query-service/auth/rbac.go b/pkg/query-service/auth/rbac.go index 38ae283bb2..44f65576ed 100644 --- a/pkg/query-service/auth/rbac.go +++ b/pkg/query-service/auth/rbac.go @@ -3,7 +3,6 @@ package auth import ( "context" "net/http" - "strings" "github.com/pkg/errors" "go.signoz.io/signoz/pkg/query-service/constants" @@ -49,19 +48,6 @@ func InitAuthCache(ctx context.Context) error { return nil } -func GetAuthorizationToken(r *http.Request) string { - authHeader := r.Header.Get("Authorization") - if authHeader == "" { - return "" - } - - authHeaderParts := strings.Fields(authHeader) - if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { - return "" - } - return authHeaderParts[1] -} - func GetUserFromRequest(r *http.Request) (*model.UserPayload, error) { accessJwt, err := ExtractJwtFromRequest(r) if err != nil { From df7f276f0306e652c953ad14ac6fedbf04424b08 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Tue, 21 Feb 2023 22:37:02 +0530 Subject: [PATCH 08/29] Change header name --- ee/query-service/app/server.go | 8 ++++---- pkg/query-service/app/auth.go | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index a634057531..42a8f2496e 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -203,14 +203,14 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, } func getPATToken(r *http.Request) (string, error) { - authHeader := r.Header.Get("Authorization") - if authHeader == "" { + patHeader := r.Header.Get("SIGNOZ-API-KEY") + if patHeader == "" { return "", nil } - authHeaderParts := strings.Fields(authHeader) + authHeaderParts := strings.Fields(patHeader) if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { - return "", fmt.Errorf("authorization header format must be Bearer {token}") + return "", fmt.Errorf("PAT authorization header format must be bearer {token}") } return authHeaderParts[1], nil diff --git a/pkg/query-service/app/auth.go b/pkg/query-service/app/auth.go index ef6541a4f6..dccf6dd8dd 100644 --- a/pkg/query-service/app/auth.go +++ b/pkg/query-service/app/auth.go @@ -19,10 +19,6 @@ func NewAuthMiddleware(f func(r *http.Request) (*model.UserPayload, error)) *Aut } } -// func (am *AuthMiddleware) GetUserFromRequest(r *http.Request) (*model.UserPayload, error) { -// return auth.GetUserFromRequest(r) -// } - func (am *AuthMiddleware) OpenAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { f(w, r) From eb2fe200251e4222e69f2baafeb9be05db1da757 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Fri, 24 Feb 2023 01:19:01 +0530 Subject: [PATCH 09/29] Address review comments --- ee/query-service/app/api/pat.go | 12 +++--- ee/query-service/app/server.go | 56 +++++++------------------ ee/query-service/dao/interface.go | 2 + ee/query-service/dao/sqlite/modelDao.go | 2 +- ee/query-service/dao/sqlite/pat.go | 45 ++++++++++++++++++++ ee/query-service/model/pat.go | 2 +- 6 files changed, 71 insertions(+), 48 deletions(-) diff --git a/ee/query-service/app/api/pat.go b/ee/query-service/app/api/pat.go index d708ba0606..619c875c8f 100644 --- a/ee/query-service/app/api/pat.go +++ b/ee/query-service/app/api/pat.go @@ -41,11 +41,13 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) { return } + // All the PATs are associated with the user creating the PAT. Hence, the permissions + // associated with the PAT is also equivalent to that of the user. req.UserID = user.Id req.CreatedAt = time.Now().Unix() req.Token = generatePATToken() - zap.S().Infof("Got PAT request: %+v", req) + zap.S().Debugf("Got PAT request: %+v", req) if apierr := ah.AppDao().CreatePAT(ctx, &req); apierr != nil { RespondError(w, apierr, nil) return @@ -70,7 +72,7 @@ func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) { RespondError(w, apierr, nil) return } - ah.WriteJSON(w, r, pats) + ah.Respond(w, pats) } func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) { @@ -84,7 +86,7 @@ func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) { }, nil) return } - pat, apierr := ah.AppDao().GetPAT(ctx, id) + pat, apierr := ah.AppDao().GetPATByID(ctx, id) if apierr != nil { RespondError(w, apierr, nil) return @@ -96,10 +98,10 @@ func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) { }, nil) return } - zap.S().Infof("Delete PAT with id: %+v", id) + zap.S().Debugf("Delete PAT with id: %+v", id) if apierr := ah.AppDao().DeletePAT(ctx, id); apierr != nil { RespondError(w, apierr, nil) return } - ah.WriteJSON(w, r, map[string]string{"data": "pat deleted successfully"}) + ah.Respond(w, map[string]string{"data": "pat deleted successfully"}) } diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index 42a8f2496e..7a0d794a88 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -10,7 +10,6 @@ import ( "net/http" _ "net/http/pprof" // http profiler "os" - "strings" "time" "github.com/gorilla/handlers" @@ -191,7 +190,7 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, // ip here for alert manager AllowedOrigins: []string{"*"}, AllowedMethods: []string{"GET", "DELETE", "POST", "PUT", "PATCH"}, - AllowedHeaders: []string{"Accept", "Authorization", "Content-Type"}, + AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "SIGNOZ-API-KEY"}, }) handler := c.Handler(r) @@ -202,50 +201,25 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, }, nil } -func getPATToken(r *http.Request) (string, error) { - patHeader := r.Header.Get("SIGNOZ-API-KEY") - if patHeader == "" { - return "", nil - } - - authHeaderParts := strings.Fields(patHeader) - if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { - return "", fmt.Errorf("PAT authorization header format must be bearer {token}") - } - - return authHeaderParts[1], nil -} - func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, error) { r := mux.NewRouter() - getUserFromPAT := func(r *http.Request) (*model.UserPayload, error) { - patToken, err := getPATToken(r) - if err != nil { - return nil, fmt.Errorf("failed to get PAT token in request headers, err: %v", err) - } - ctx := context.Background() - dao := apiHandler.AppDao() - pat, err := dao.GetPAT(ctx, patToken) - if err != nil { - return nil, fmt.Errorf("failed to fetch PAT token from DB, err %v", err) - } - user, apierr := dao.GetUser(ctx, pat.UserID) - if apierr != nil { - return nil, fmt.Errorf("failed to fetch user for PAT from DB, err: %v", apierr) - } - return user, nil - } - getUserFromRequest := func(r *http.Request) (*model.UserPayload, error) { - user, err := getUserFromPAT(r) - if err == nil && user != nil { - zap.S().Debugf("Found valid PAT user: %+v", user) - return user, nil - } - if err != nil { - zap.S().Debugf("Error while getting user for PAT: %+v", err) + patToken := r.Header.Get("SIGNOZ-API-KEY") + if len(patToken) > 0 { + zap.S().Debugf("Received a non-zero length PAT token") + ctx := context.Background() + dao := apiHandler.AppDao() + + user, err := dao.GetUserByPAT(ctx, patToken) + if err == nil && user != nil { + zap.S().Debugf("Found valid PAT user: %+v", user) + return user, nil + } + if err != nil { + zap.S().Debugf("Error while getting user for PAT: %+v", err) + } } return baseauth.GetUserFromRequest(r) } diff --git a/ee/query-service/dao/interface.go b/ee/query-service/dao/interface.go index da6963f68c..2303bb72d4 100644 --- a/ee/query-service/dao/interface.go +++ b/ee/query-service/dao/interface.go @@ -36,6 +36,8 @@ type ModelDao interface { CreatePAT(ctx context.Context, p *model.PAT) basemodel.BaseApiError GetPAT(ctx context.Context, pat string) (*model.PAT, basemodel.BaseApiError) + GetPATByID(ctx context.Context, id string) (*model.PAT, basemodel.BaseApiError) + GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, basemodel.BaseApiError) ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) DeletePAT(ctx context.Context, id string) basemodel.BaseApiError } diff --git a/ee/query-service/dao/sqlite/modelDao.go b/ee/query-service/dao/sqlite/modelDao.go index 9b1d74c034..3c195ea9bf 100644 --- a/ee/query-service/dao/sqlite/modelDao.go +++ b/ee/query-service/dao/sqlite/modelDao.go @@ -52,7 +52,7 @@ func InitDB(dataSourceName string) (*modelDao, error) { CREATE TABLE IF NOT EXISTS personal_access_tokens ( id INTEGER PRIMARY KEY AUTOINCREMENT, user_id TEXT NOT NULL, - token TEXT NOT NULL, + token TEXT NOT NULL UNIQUE, name TEXT NOT NULL, created_at INTEGER NOT NULL, expires_at INTEGER NOT NULL, diff --git a/ee/query-service/dao/sqlite/pat.go b/ee/query-service/dao/sqlite/pat.go index 7b3569db66..cc4de546c5 100644 --- a/ee/query-service/dao/sqlite/pat.go +++ b/ee/query-service/dao/sqlite/pat.go @@ -59,3 +59,48 @@ func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, basemo return &pats[0], nil } + +func (m *modelDao) GetPATByID(ctx context.Context, id string) (*model.PAT, basemodel.BaseApiError) { + pats := []model.PAT{} + + if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE id=?;`, id); err != nil { + return nil, model.InternalError(fmt.Errorf("failed to fetch PAT")) + } + + if len(pats) != 1 { + return nil, &model.ApiError{ + Typ: model.ErrorInternal, + Err: fmt.Errorf("found zero or multiple PATs with same token"), + } + } + + return &pats[0], nil +} + +func (m *modelDao) GetUserByPAT(ctx context.Context, token string) (*basemodel.UserPayload, basemodel.BaseApiError) { + users := []basemodel.UserPayload{} + + query := `SELECT + u.id, + u.name, + u.email, + u.password, + u.created_at, + u.profile_picture_url, + u.org_id, + u.group_id + FROM users u, personal_access_tokens p + WHERE u.id = p.user_id and p.token=?;` + + if err := m.DB().Select(&users, query, token); err != nil { + return nil, model.InternalError(fmt.Errorf("failed to fetch user from PAT, err: %v", err)) + } + + if len(users) != 1 { + return nil, &model.ApiError{ + Typ: model.ErrorInternal, + Err: fmt.Errorf("found zero or multiple users with same PAT token"), + } + } + return &users[0], nil +} diff --git a/ee/query-service/model/pat.go b/ee/query-service/model/pat.go index f320d0be7c..c22282060b 100644 --- a/ee/query-service/model/pat.go +++ b/ee/query-service/model/pat.go @@ -6,5 +6,5 @@ type PAT struct { Token string `json:"token" db:"token"` Name string `json:"name" db:"name"` CreatedAt int64 `json:"createdAt" db:"created_at"` - ExpiresAt int64 `json:"expiresAt" db:"expires_at"` + ExpiresAt int64 `json:"expiresAt" db:"expires_at"` // unused as of now } From 5e5e81d81d465c8af963030bf1a606176dfb156c Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Wed, 1 Mar 2023 10:55:07 +0530 Subject: [PATCH 10/29] chore: add payload types for autocomplete requests (#2244) --- pkg/query-service/model/v3/v3.go | 240 +++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 pkg/query-service/model/v3/v3.go diff --git a/pkg/query-service/model/v3/v3.go b/pkg/query-service/model/v3/v3.go new file mode 100644 index 0000000000..fc9b72075b --- /dev/null +++ b/pkg/query-service/model/v3/v3.go @@ -0,0 +1,240 @@ +package v3 + +import "time" + +type DataSource string + +const ( + DataSourceTraces DataSource = "traces" + DataSourceLogs DataSource = "logs" + DataSourceMetrics DataSource = "metrics" +) + +type AggregateOperator string + +const ( + AggregateOperatorNoOp AggregateOperator = "noop" + AggregateOpeatorCount AggregateOperator = "count" + AggregateOperatorCountDistinct AggregateOperator = "count_distinct" + AggregateOperatorSum AggregateOperator = "sum" + AggregateOperatorAvg AggregateOperator = "avg" + AggregateOperatorMin AggregateOperator = "min" + AggregateOperatorMax AggregateOperator = "max" + AggregateOperatorP05 AggregateOperator = "p05" + AggregateOperatorP10 AggregateOperator = "p10" + AggregateOperatorP20 AggregateOperator = "p20" + AggregateOperatorP25 AggregateOperator = "p25" + AggregateOperatorP50 AggregateOperator = "p50" + AggregateOperatorP75 AggregateOperator = "p75" + AggregateOperatorP90 AggregateOperator = "p90" + AggregateOperatorP95 AggregateOperator = "p95" + AggregateOperatorP99 AggregateOperator = "p99" + AggregateOperatorRate AggregateOperator = "rate" + AggregateOperatorSumRate AggregateOperator = "sum_rate" + AggregateOperatorAvgRate AggregateOperator = "avg_rate" + AggregateOperatorMinRate AggregateOperator = "min_rate" + AggregateOperatorMaxRate AggregateOperator = "max_rate" + AggregateOperatorRateSum AggregateOperator = "rate_sum" + AggregateOperatorRateAvg AggregateOperator = "rate_avg" + AggregateOperatorRateMin AggregateOperator = "rate_min" + AggregateOperatorRateMax AggregateOperator = "rate_max" + AggregateOperatorHistQuant50 AggregateOperator = "hist_quantile_50" + AggregateOperatorHistQuant75 AggregateOperator = "hist_quantile_75" + AggregateOperatorHistQuant90 AggregateOperator = "hist_quantile_90" + AggregateOperatorHistQuant95 AggregateOperator = "hist_quantile_95" + AggregateOperatorHistQuant99 AggregateOperator = "hist_quantile_99" +) + +type ReduceToOperator string + +const ( + ReduceToOperatorLast ReduceToOperator = "last" + ReduceToOperatorSum ReduceToOperator = "sum" + ReduceToOperatorAvg ReduceToOperator = "avg" + ReduceToOperatorMin ReduceToOperator = "min" + ReduceToOperatorMax ReduceToOperator = "max" +) + +type QueryType string + +const ( + QueryTypeBuilder QueryType = "builder" + QueryTypeClickHouseSQL QueryType = "clickhouse_sql" + QueryTypePromQL QueryType = "promql" +) + +type PanelType string + +const ( + PanelTypeValue PanelType = "value" + PanelTypeGraph PanelType = "graph" + PanelTypeTable PanelType = "table" + PanelTypeList PanelType = "list" +) + +// AggregateAttributeRequest is a request to fetch possible attribute keys +// for a selected aggregate operator and search text. +// The context of the selected aggregate operator is used as the +// type of the attribute key is different for different aggregate operators. +// For example, for the aggregate operator "avg" the attribute value type must be +// a number +type AggregateAttributeRequest struct { + DataSource DataSource `json:"dataSource"` + Operator AggregateOperator `json:"aggregateOperator"` + SearchText string `json:"searchText"` + Limit int `json:"limit"` +} + +type TagType string + +const ( + TagTypeColumn TagType = "column" + TagTypeTag TagType = "tag" + TagTypeResource TagType = "resource" +) + +// FilterAttributeKeyRequest is a request to fetch possible attribute keys +// for a selected aggregate operator and aggregate attribute and search text. +type FilterAttributeKeyRequest struct { + DataSource DataSource `json:"dataSource"` + AggregateOperator AggregateOperator `json:"aggregateOperator"` + AggregateAttribute string `json:"aggregateAttribute"` + TagType TagType `json:"tagType"` + SearchText string `json:"searchText"` + Limit int `json:"limit"` +} + +type FilterAttributeKeyDataType string + +const ( + FilterAttributeKeyDataTypeString FilterAttributeKeyDataType = "string" + FilterAttributeKeyDataTypeNumber FilterAttributeKeyDataType = "number" + FilterAttributeKeyDataTypeBool FilterAttributeKeyDataType = "bool" +) + +// FilterAttributeValueRequest is a request to fetch possible attribute values +// for a selected aggregate operator, aggregate attribute, filter attribute key +// and search text. +type FilterAttributeValueRequest struct { + DataSource DataSource `json:"dataSource"` + AggregateOperator AggregateOperator `json:"aggregateOperator"` + AggregateAttribute string `json:"aggregateAttribute"` + FilterAttributeKey string `json:"filterAttributeKey"` + FilterAttributeKeyDataType FilterAttributeKeyDataType `json:"filterAttributeKeyDataType"` + TagType TagType `json:"tagType"` + SearchText string `json:"searchText"` + Limit int `json:"limit"` +} + +type AggregateAttributeResponse struct { + AttributeKeys []AttributeKey `json:"attributeKeys"` +} + +type FilterAttributeKeyResponse struct { + AttributeKeys []AttributeKey `json:"attributeKeys"` +} + +type AttributeKey struct { + Key string `json:"key"` + DataType string `json:"dataType"` + Type string `json:"type"` // "column" or "tag"/"attr"/"attribute" or "resource"? +} + +type FilterAttributeValueResponse struct { + StringAttributeValues []string `json:"stringAttributeValues"` + NumberAttributeValues []interface{} `json:"numberAttributeValues"` + BoolAttributeValues []bool `json:"boolAttributeValues"` +} + +type QueryRangeParamsV3 struct { + Start int64 `json:"start"` + End int64 `json:"end"` + Step int64 `json:"step"` + CompositeQuery *CompositeQuery `json:"compositeQuery"` + Variables map[string]interface{} `json:"variables,omitempty"` +} + +type PromQuery struct { + Query string `json:"query"` + Stats string `json:"stats,omitempty"` + Disabled bool `json:"disabled"` +} + +type ClickHouseQuery struct { + Query string `json:"query"` + Disabled bool `json:"disabled"` +} + +type CompositeQuery struct { + BuilderQueries map[string]*BuilderQuery `json:"builderQueries,omitempty"` + ClickHouseQueries map[string]*ClickHouseQuery `json:"chQueries,omitempty"` + PromQueries map[string]*PromQuery `json:"promQueries,omitempty"` + PanelType PanelType `json:"panelType"` + QueryType QueryType `json:"queryType"` +} + +type BuilderQuery struct { + QueryName string `json:"queryName"` + DataSource DataSource `json:"dataSource"` + AggregateOperator AggregateOperator `json:"aggregateOperator"` + AggregateAttribute string `json:"aggregateAttribute,omitempty"` + Filters *FilterSet `json:"filters,omitempty"` + GroupBy []string `json:"groupBy,omitempty"` + Expression string `json:"expression"` + Disabled bool `json:"disabled"` + Having []Having `json:"having,omitempty"` + Limit uint64 `json:"limit"` + Offset uint64 `json:"offset"` + PageSize uint64 `json:"pageSize"` + OrderBy []OrderBy `json:"orderBy,omitempty"` + ReduceTo ReduceToOperator `json:"reduceTo,omitempty"` + SelectColumns []string `json:"selectColumns,omitempty"` +} + +type FilterSet struct { + Operator string `json:"op,omitempty"` + Items []FilterItem `json:"items"` +} + +type FilterItem struct { + Key string `json:"key"` + Value interface{} `json:"value"` + Operator string `json:"op"` +} + +type OrderBy struct { + ColumnName string `json:"columnName"` + Order string `json:"order"` +} + +type Having struct { + ColumnName string `json:"columnName"` + Operator string `json:"operator"` + Value interface{} `json:"value"` +} + +type QueryRangeResponse struct { + ResultType string `json:"resultType"` + Result []*Result `json:"result"` +} + +type Result struct { + QueryName string `json:"queryName"` + Series *Series `json:"series"` + List []*Row `json:"list"` +} + +type Series struct { + Labels map[string]string `json:"labels"` + Points []Point `json:"values"` +} + +type Row struct { + Timestamp time.Time `json:"timestamp"` + Data map[string]string `json:"data"` +} + +type Point struct { + Timestamp int64 `json:"timestamp"` + Value float64 `json:"value"` +} From 50270281e3d18c3c440f9fb0663e2a8372f23664 Mon Sep 17 00:00:00 2001 From: palashgdev Date: Wed, 1 Mar 2023 17:18:02 +0530 Subject: [PATCH 11/29] fix: Logs Live Tail is fixed (#2380) * logs is updated * fix: log live tail is updated * fix: live tail is fixed * chore: build is fixed * chore: useEffect is removed * chore: getLogsAggregate callback is added in the useEffect --- frontend/src/container/LogLiveTail/index.tsx | 120 ++++++++++++++---- .../src/container/LogsAggregate/index.tsx | 89 ++++--------- .../src/container/LogsSearchFilter/index.tsx | 20 ++- frontend/src/hooks/useInterval.ts | 21 ++- 4 files changed, 155 insertions(+), 95 deletions(-) diff --git a/frontend/src/container/LogLiveTail/index.tsx b/frontend/src/container/LogLiveTail/index.tsx index f0cacd527c..1139342a9d 100644 --- a/frontend/src/container/LogLiveTail/index.tsx +++ b/frontend/src/container/LogLiveTail/index.tsx @@ -8,40 +8,50 @@ import { Button, Popover, Select, Space } from 'antd'; import { LiveTail } from 'api/logs/livetail'; import dayjs from 'dayjs'; import { useIsDarkMode } from 'hooks/useDarkMode'; +import { useNotifications } from 'hooks/useNotifications'; +import getStep from 'lib/getStep'; import { throttle } from 'lodash-es'; import React, { useCallback, useEffect, useMemo, useRef } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; +import { connect, useDispatch, useSelector } from 'react-redux'; +import { bindActionCreators, Dispatch } from 'redux'; +import { ThunkDispatch } from 'redux-thunk'; +import { getLogsAggregate } from 'store/actions/logs/getLogsAggregate'; import { AppState } from 'store/reducers'; +import AppActions from 'types/actions'; import { UPDATE_AUTO_REFRESH_DISABLED } from 'types/actions/globalTime'; import { FLUSH_LOGS, PUSH_LIVE_TAIL_EVENT, SET_LIVE_TAIL_START_TIME, + SET_LOADING, TOGGLE_LIVE_TAIL, } from 'types/actions/logs'; import { TLogsLiveTailState } from 'types/api/logs/liveTail'; +import { ILog } from 'types/api/logs/log'; import { GlobalReducer } from 'types/reducer/globalTime'; import { ILogsReducer } from 'types/reducer/logs'; import { TIME_PICKER_OPTIONS } from './config'; import { StopContainer, TimePickerCard, TimePickerSelect } from './styles'; -const { Option } = Select; - -function LogLiveTail(): JSX.Element { +function LogLiveTail({ getLogsAggregate }: Props): JSX.Element { const { liveTail, searchFilter: { queryString }, liveTailStartRange, logs, + idEnd, + idStart, } = useSelector((state) => state.logs); + const isDarkMode = useIsDarkMode(); const { selectedAutoRefreshInterval } = useSelector( (state) => state.globalTime, ); + const { notifications } = useNotifications(); - const dispatch = useDispatch(); + const dispatch = useDispatch>(); const handleLiveTail = (toggleState: TLogsLiveTailState): void => { dispatch({ type: TOGGLE_LIVE_TAIL, @@ -53,7 +63,7 @@ function LogLiveTail(): JSX.Element { }); }; - const batchedEventsRef = useRef[]>([]); + const batchedEventsRef = useRef([]); const pushLiveLog = useCallback(() => { dispatch({ @@ -75,47 +85,76 @@ function LogLiveTail(): JSX.Element { [pushLiveLogThrottled], ); + const firstLogsId = useMemo(() => logs[0]?.id, [logs]); + // This ref depicts thats whether the live tail is played from paused state or not. - const liveTailSourceRef = useRef(null); + const liveTailSourceRef = useRef(); + useEffect(() => { if (liveTail === 'PLAYING') { - // console.log('Starting Live Tail', logs.length); const timeStamp = dayjs().subtract(liveTailStartRange, 'minute').valueOf(); const queryParams = new URLSearchParams({ ...(queryString ? { q: queryString } : {}), timestampStart: (timeStamp * 1e6) as never, - ...(liveTailSourceRef.current && logs.length > 0 + ...(liveTailSourceRef.current && firstLogsId ? { - idGt: logs[0].id, + idGt: firstLogsId, } : {}), }); + + if (liveTailSourceRef.current) { + liveTailSourceRef.current.close(); + } + const source = LiveTail(queryParams.toString()); liveTailSourceRef.current = source; source.onmessage = function connectionMessage(e): void { batchLiveLog(e); }; - // source.onopen = function connectionOpen(): void { }; source.onerror = function connectionError(event: unknown): void { console.error(event); source.close(); dispatch({ type: TOGGLE_LIVE_TAIL, + payload: 'STOPPED', + }); + dispatch({ + type: SET_LOADING, payload: false, }); + notifications.error({ + message: 'Live tail stopped due to some error.', + }); }; - } else if (liveTailSourceRef.current && liveTailSourceRef.current.close) { - liveTailSourceRef.current?.close(); } if (liveTail === 'STOPPED') { - liveTailSourceRef.current = null; + liveTailSourceRef.current = undefined; } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [liveTail]); + }, [liveTail, queryString, notifications, dispatch]); const handleLiveTailStart = (): void => { handleLiveTail('PLAYING'); + const startTime = + dayjs().subtract(liveTailStartRange, 'minute').valueOf() * 1e6; + + const endTime = dayjs().valueOf() * 1e6; + + getLogsAggregate({ + timestampStart: startTime, + timestampEnd: endTime, + step: getStep({ + start: startTime, + end: endTime, + inputFormat: 'ns', + }), + q: queryString, + ...(idStart ? { idGt: idStart } : {}), + ...(idEnd ? { idLt: idEnd } : {}), + }); + if (!liveTailSourceRef.current) { dispatch({ type: FLUSH_LOGS, @@ -129,16 +168,18 @@ function LogLiveTail(): JSX.Element { disabled={liveTail === 'PLAYING'} value={liveTailStartRange} onChange={(value): void => { - dispatch({ - type: SET_LIVE_TAIL_START_TIME, - payload: value, - }); + if (typeof value === 'number') { + dispatch({ + type: SET_LIVE_TAIL_START_TIME, + payload: value, + }); + } }} > {TIME_PICKER_OPTIONS.map((optionData) => ( - + ))} ), @@ -149,13 +190,28 @@ function LogLiveTail(): JSX.Element { selectedAutoRefreshInterval, ]); + const onLiveTailStop = (): void => { + handleLiveTail('STOPPED'); + dispatch({ + type: UPDATE_AUTO_REFRESH_DISABLED, + payload: false, + }); + dispatch({ + type: SET_LOADING, + payload: false, + }); + if (liveTailSourceRef.current) { + liveTailSourceRef.current.close(); + } + }; + return ( {liveTail === 'PLAYING' ? ( )} @@ -196,4 +248,16 @@ function LogLiveTail(): JSX.Element { ); } -export default LogLiveTail; +interface DispatchProps { + getLogsAggregate: typeof getLogsAggregate; +} + +type Props = DispatchProps; + +const mapDispatchToProps = ( + dispatch: ThunkDispatch, +): DispatchProps => ({ + getLogsAggregate: bindActionCreators(getLogsAggregate, dispatch), +}); + +export default connect(null, mapDispatchToProps)(LogLiveTail); diff --git a/frontend/src/container/LogsAggregate/index.tsx b/frontend/src/container/LogsAggregate/index.tsx index 5084f2fdca..c1217c0e46 100644 --- a/frontend/src/container/LogsAggregate/index.tsx +++ b/frontend/src/container/LogsAggregate/index.tsx @@ -2,20 +2,20 @@ import { blue } from '@ant-design/colors'; import Graph from 'components/Graph'; import Spinner from 'components/Spinner'; import dayjs from 'dayjs'; +import useInterval from 'hooks/useInterval'; import getStep from 'lib/getStep'; -import React, { memo, useEffect, useMemo, useRef } from 'react'; +import React, { useMemo } from 'react'; import { connect, useSelector } from 'react-redux'; -import { bindActionCreators, Dispatch } from 'redux'; +import { bindActionCreators } from 'redux'; import { ThunkDispatch } from 'redux-thunk'; import { getLogsAggregate } from 'store/actions/logs/getLogsAggregate'; import { AppState } from 'store/reducers'; import AppActions from 'types/actions'; -import { GlobalReducer } from 'types/reducer/globalTime'; import { ILogsReducer } from 'types/reducer/logs'; import { Container } from './styles'; -function LogsAggregate({ getLogsAggregate }: LogsAggregateProps): JSX.Element { +function LogsAggregate({ getLogsAggregate }: DispatchProps): JSX.Element { const { searchFilter: { queryString }, idEnd, @@ -26,57 +26,30 @@ function LogsAggregate({ getLogsAggregate }: LogsAggregateProps): JSX.Element { liveTailStartRange, } = useSelector((state) => state.logs); - const { maxTime, minTime } = useSelector( - (state) => state.globalTime, + useInterval( + () => { + const startTime = + dayjs().subtract(liveTailStartRange, 'minute').valueOf() * 1e6; + + const endTime = dayjs().valueOf() * 1e6; + + getLogsAggregate({ + timestampStart: startTime, + timestampEnd: endTime, + step: getStep({ + start: startTime, + end: endTime, + inputFormat: 'ns', + }), + q: queryString, + ...(idStart ? { idGt: idStart } : {}), + ...(idEnd ? { idLt: idEnd } : {}), + }); + }, + 60000, + liveTail === 'PLAYING', ); - const reFetchIntervalRef = useRef | null>(null); - - useEffect(() => { - switch (liveTail) { - case 'STOPPED': { - if (reFetchIntervalRef.current) { - clearInterval(reFetchIntervalRef.current); - } - reFetchIntervalRef.current = null; - break; - } - - case 'PLAYING': { - const aggregateCall = (): void => { - const startTime = - dayjs().subtract(liveTailStartRange, 'minute').valueOf() * 1e6; - const endTime = dayjs().valueOf() * 1e6; - getLogsAggregate({ - timestampStart: startTime, - timestampEnd: endTime, - step: getStep({ - start: startTime, - end: endTime, - inputFormat: 'ns', - }), - q: queryString, - ...(idStart ? { idGt: idStart } : {}), - ...(idEnd ? { idLt: idEnd } : {}), - }); - }; - aggregateCall(); - reFetchIntervalRef.current = setInterval(aggregateCall, 60000); - break; - } - case 'PAUSED': { - if (reFetchIntervalRef.current) { - clearInterval(reFetchIntervalRef.current); - } - break; - } - default: { - break; - } - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [getLogsAggregate, maxTime, minTime, liveTail]); - const graphData = useMemo( () => ({ labels: logsAggregate.map((s) => new Date(s.timestamp / 1000000)), @@ -107,14 +80,8 @@ function LogsAggregate({ getLogsAggregate }: LogsAggregateProps): JSX.Element { ); } -interface LogsAggregateProps { - getLogsAggregate: (arg0: Parameters[0]) => void; -} - interface DispatchProps { - getLogsAggregate: ( - props: Parameters[0], - ) => (dispatch: Dispatch) => void; + getLogsAggregate: typeof getLogsAggregate; } const mapDispatchToProps = ( @@ -123,4 +90,4 @@ const mapDispatchToProps = ( getLogsAggregate: bindActionCreators(getLogsAggregate, dispatch), }); -export default connect(null, mapDispatchToProps)(memo(LogsAggregate)); +export default connect(null, mapDispatchToProps)(LogsAggregate); diff --git a/frontend/src/container/LogsSearchFilter/index.tsx b/frontend/src/container/LogsSearchFilter/index.tsx index 3751b91487..670c58cf70 100644 --- a/frontend/src/container/LogsSearchFilter/index.tsx +++ b/frontend/src/container/LogsSearchFilter/index.tsx @@ -74,6 +74,7 @@ function SearchFilter({ const handleSearch = useCallback( (customQuery: string) => { getLogsFields(); + const { maxTime, minTime } = globalTime; if (liveTail === 'PLAYING') { dispatch({ @@ -87,9 +88,24 @@ function SearchFilter({ type: TOGGLE_LIVE_TAIL, payload: liveTail, }); - } else { - const { maxTime, minTime } = globalTime; + dispatch({ + type: SET_LOADING, + payload: false, + }); + getLogsAggregate({ + timestampStart: minTime, + timestampEnd: maxTime, + step: getStep({ + start: minTime, + end: maxTime, + inputFormat: 'ns', + }), + q: customQuery, + ...(idStart ? { idGt: idStart } : {}), + ...(idEnd ? { idLt: idEnd } : {}), + }); + } else { getLogs({ q: customQuery, limit: logLinesPerPage, diff --git a/frontend/src/hooks/useInterval.ts b/frontend/src/hooks/useInterval.ts index 09438509dd..2b332b9041 100644 --- a/frontend/src/hooks/useInterval.ts +++ b/frontend/src/hooks/useInterval.ts @@ -1,6 +1,10 @@ import { useEffect, useRef } from 'react'; -function useInterval(callback: () => void, delay: number): void { +function useInterval( + callback: () => void, + delay: number, + enabled = true, +): void { const savedCallback = useRef<() => void>(); useEffect(() => { @@ -14,9 +18,18 @@ function useInterval(callback: () => void, delay: number): void { } } - const id = setInterval(tick, delay); - return (): void => clearInterval(id); - }, [delay]); + let id: NodeJS.Timer; + + if (enabled) { + id = setInterval(tick, delay); + } + + return (): void => { + if (id) { + clearInterval(id); + } + }; + }, [delay, enabled]); } export default useInterval; From e46b7e41e5cef869c861774aa1fcbaa8ce462e47 Mon Sep 17 00:00:00 2001 From: palashgdev Date: Wed, 1 Mar 2023 17:26:37 +0530 Subject: [PATCH 12/29] feat: restricted_SELECTED_FIELDS is filtered from the selected list (#2401) * feat: restricted_SELECTED_FIELDS is filtered from the selected list * chore: selected id fields is removed from the rendering part --- frontend/src/components/Logs/ListLogView/index.tsx | 7 ++++++- frontend/src/components/Logs/TableView/index.tsx | 8 ++++---- frontend/src/container/LogsFilters/index.tsx | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Logs/ListLogView/index.tsx b/frontend/src/components/Logs/ListLogView/index.tsx index d8108062aa..d38102c378 100644 --- a/frontend/src/components/Logs/ListLogView/index.tsx +++ b/frontend/src/components/Logs/ListLogView/index.tsx @@ -103,6 +103,11 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element { }); }; + const updatedSelecedFields = useMemo( + () => selected.filter((e) => e.name !== 'id'), + [selected], + ); + return (
@@ -123,7 +128,7 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element { {'}'}
- {map(selected, (field) => + {map(updatedSelecedFields, (field) => isValidLogField(flattenLogData[field.name] as never) ? ( > = useMemo(() => { - const fieldColumns: ColumnsType> = fields.map( - ({ name }) => ({ + const fieldColumns: ColumnsType> = fields + .filter((e) => e.name !== 'id') + .map(({ name }) => ({ title: name, dataIndex: name, key: name, @@ -48,8 +49,7 @@ function LogsTableView(props: LogsTableViewProps): JSX.Element { ), }), - }), - ); + })); return [ { diff --git a/frontend/src/container/LogsFilters/index.tsx b/frontend/src/container/LogsFilters/index.tsx index d5a673395a..26c3bd739a 100644 --- a/frontend/src/container/LogsFilters/index.tsx +++ b/frontend/src/container/LogsFilters/index.tsx @@ -7,7 +7,7 @@ import { useSelector } from 'react-redux'; import { AppState } from 'store/reducers'; import { ILogsReducer } from 'types/reducer/logs'; -import { ICON_STYLE } from './config'; +import { ICON_STYLE, RESTRICTED_SELECTED_FIELDS } from './config'; import FieldItem from './FieldItem'; import { CategoryContainer, FieldContainer } from './styles'; import { IHandleInterestProps, IHandleRemoveInterestProps } from './types'; @@ -71,6 +71,7 @@ function LogsFilters(): JSX.Element { {selected .filter((field) => fieldSearchFilter(field.name, filterValuesInput)) + .filter((field) => RESTRICTED_SELECTED_FIELDS.indexOf(field.name) === -1) .map((field, idx) => ( Date: Fri, 3 Mar 2023 14:35:11 +0530 Subject: [PATCH 13/29] feat: add span links support (#2415) * feat: add span links support * fix: handle an edge case * chore: test is fixed * chore: some of the refactoring is updated --------- Co-authored-by: Palash Gupta --- .../SelectedSpanDetails/Tags/index.tsx | 38 +++++++++- .../TraceDetail/SelectedSpanDetails/index.tsx | 9 ++- frontend/src/types/api/trace/getTraceItem.ts | 3 +- .../__snapshots__/spanToTree.test.ts.snap | 75 ++++++++++--------- frontend/src/utils/spanToTree.ts | 37 ++++++--- 5 files changed, 111 insertions(+), 51 deletions(-) diff --git a/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/index.tsx b/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/index.tsx index 7bd2449cc1..4c9e5227ca 100644 --- a/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/index.tsx +++ b/frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/index.tsx @@ -1,4 +1,6 @@ -import { Input, Typography } from 'antd'; +import { Input, List, Typography } from 'antd'; +import ROUTES from 'constants/routes'; +import { formUrlParams } from 'container/TraceDetail/utils'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ITraceTag } from 'types/api/trace/getTraceItem'; @@ -7,7 +9,12 @@ import { ModalText } from '..'; import { Container } from './styles'; import Tag from './Tag'; -function Tags({ tags, onToggleHandler, setText }: TagsProps): JSX.Element { +function Tags({ + tags, + linkedSpans, + onToggleHandler, + setText, +}: TagsProps): JSX.Element { const { t } = useTranslation(['traceDetails']); const [allRenderedTags, setAllRenderedTags] = useState(tags); const isSearchVisible = useMemo(() => tags.length > 5, [tags]); @@ -16,6 +23,16 @@ function Tags({ tags, onToggleHandler, setText }: TagsProps): JSX.Element { setAllRenderedTags(tags); }, [tags]); + const getLink = useCallback( + (item: Record) => + `${ROUTES.TRACE}/${item.TraceId}${formUrlParams({ + spanId: item.SpanId, + levelUp: 0, + levelDown: 0, + })}`, + [], + ); + const onChangeHandler = useCallback( (e: React.ChangeEvent): void => { const { value } = e.target; @@ -38,7 +55,6 @@ function Tags({ tags, onToggleHandler, setText }: TagsProps): JSX.Element { onChange={onChangeHandler} /> )} - {allRenderedTags.map((tag) => ( ))} + {linkedSpans && linkedSpans.length > 0 && ( + Linked Spans} + dataSource={linkedSpans} + renderItem={(item): JSX.Element => ( + + {item.SpanId} + + )} + /> + )} ); } interface TagsProps extends CommonTagsProps { tags: ITraceTag[]; + linkedSpans?: Record[]; } export interface CommonTagsProps { @@ -62,4 +90,8 @@ export interface CommonTagsProps { setText: React.Dispatch>; } +Tags.defaultProps = { + linkedSpans: [], +}; + export default Tags; diff --git a/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx b/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx index d6c37783a1..a9bf00cd0f 100644 --- a/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx +++ b/frontend/src/container/TraceDetail/SelectedSpanDetails/index.tsx @@ -42,7 +42,7 @@ function SelectedSpanDetails(props: SelectedSpanDetailsProps): JSX.Element { return
; } - const { tags } = tree; + const { tags, nonChildReferences } = tree; return ( @@ -83,7 +83,12 @@ function SelectedSpanDetails(props: SelectedSpanDetailsProps): JSX.Element { - + []; + nonChildReferences?: Record[]; // For internal use isProcessed?: boolean; - references?: Record[]; } export interface ITraceTag { diff --git a/frontend/src/utils/__tests__/__snapshots__/spanToTree.test.ts.snap b/frontend/src/utils/__tests__/__snapshots__/spanToTree.test.ts.snap index 2c2ab402e2..c3149cf21a 100644 --- a/frontend/src/utils/__tests__/__snapshots__/spanToTree.test.ts.snap +++ b/frontend/src/utils/__tests__/__snapshots__/spanToTree.test.ts.snap @@ -5,10 +5,31 @@ Object { "missingSpanTree": Array [], "spanTree": Array [ Object { + "childReferences": Array [ + Object { + "RefType": "CHILD_OF", + "SpanId": "", + "TraceId": "0000000000000000span_1", + }, + ], "children": Array [ Object { + "childReferences": Array [ + Object { + "RefType": "CHILD_OF", + "SpanId": "span_1", + "TraceId": "0000000000000000span_1", + }, + ], "children": Array [ Object { + "childReferences": Array [ + Object { + "RefType": "CHILD_OF", + "SpanId": "span_2", + "TraceId": "0000000000000000span_1", + }, + ], "children": Array [], "event": Array [ Object { @@ -25,13 +46,7 @@ Object { "id": "span_3", "isProcessed": true, "name": "HTTP GET SPAN 3", - "references": Array [ - Object { - "RefType": "CHILD_OF", - "SpanId": "span_2", - "TraceId": "0000000000000000span_1", - }, - ], + "nonChildReferences": Array [], "serviceColour": "", "serviceName": "frontend", "startTime": 1657275433246, @@ -60,13 +75,7 @@ Object { "id": "span_2", "isProcessed": true, "name": "HTTP GET SPAN 2", - "references": Array [ - Object { - "RefType": "CHILD_OF", - "SpanId": "span_1", - "TraceId": "0000000000000000span_1", - }, - ], + "nonChildReferences": Array [], "serviceColour": "", "serviceName": "frontend", "startTime": 1657275433246, @@ -94,13 +103,7 @@ Object { "hasError": false, "id": "span_1", "name": "HTTP GET SPAN 1", - "references": Array [ - Object { - "RefType": "CHILD_OF", - "SpanId": "", - "TraceId": "0000000000000000span_1", - }, - ], + "nonChildReferences": Array [], "serviceColour": "", "serviceName": "frontend", "startTime": 1657275433246, @@ -123,6 +126,13 @@ Object { Object { "children": Array [ Object { + "childReferences": Array [ + Object { + "RefType": "CHILD_OF", + "SpanId": "span_2", + "TraceId": "0000000000000000span_1", + }, + ], "children": Array [], "event": Array [ Object { @@ -139,13 +149,7 @@ Object { "id": "span_3", "isProcessed": true, "name": "HTTP GET SPAN 3", - "references": Array [ - Object { - "RefType": "CHILD_OF", - "SpanId": "span_2", - "TraceId": "0000000000000000span_1", - }, - ], + "nonChildReferences": Array [], "serviceColour": "", "serviceName": "frontend", "startTime": 1657275433246, @@ -172,6 +176,13 @@ Object { ], "spanTree": Array [ Object { + "childReferences": Array [ + Object { + "RefType": "CHILD_OF", + "SpanId": "", + "TraceId": "0000000000000000span_1", + }, + ], "children": Array [], "event": Array [ Object { @@ -187,13 +198,7 @@ Object { "hasError": false, "id": "span_1", "name": "HTTP GET SPAN 1", - "references": Array [ - Object { - "RefType": "CHILD_OF", - "SpanId": "", - "TraceId": "0000000000000000span_1", - }, - ], + "nonChildReferences": Array [], "serviceColour": "", "serviceName": "frontend", "startTime": 1657275433246, diff --git a/frontend/src/utils/spanToTree.ts b/frontend/src/utils/spanToTree.ts index 4a1933c2d4..35d17f0681 100644 --- a/frontend/src/utils/spanToTree.ts +++ b/frontend/src/utils/spanToTree.ts @@ -4,8 +4,20 @@ import { ITraceForest, ITraceTree, Span } from 'types/api/trace/getTraceItem'; const getSpanReferences = ( rawReferences: string[] = [], -): Record[] => - rawReferences.map((rawRef) => { + isChildReference: boolean, +): Record[] => { + let filteredReferences = []; + if (isChildReference) { + filteredReferences = rawReferences.filter((value) => + value.includes('CHILD_OF'), + ); + } else { + filteredReferences = rawReferences.filter( + (value) => !value.includes('CHILD_OF'), + ); + } + + return filteredReferences.map((rawRef) => { const refObject: Record = {}; rawRef .replaceAll('{', '') @@ -19,6 +31,7 @@ const getSpanReferences = ( return refObject; }); +}; // This getSpanTags is migrated from the previous implementation. const getSpanTags = (spanData: Span): { key: string; value: string }[] => { @@ -41,7 +54,7 @@ export const spanToTreeUtil = (inputSpanList: Span[]): ITraceForest => { const traceIdSet: Set = new Set(); const spanMap: Record = {}; - const createTarceRootSpan = ( + const createTraceRootSpan = ( spanReferences: Record[], ): void => { spanReferences.forEach(({ SpanId, TraceId }) => { @@ -64,7 +77,8 @@ export const spanToTreeUtil = (inputSpanList: Span[]): ITraceForest => { }; spanList.forEach((span) => { - const spanReferences = getSpanReferences(span[9] as string[]); + const childReferences = getSpanReferences(span[9] as string[], true); + const nonChildReferences = getSpanReferences(span[9] as string[], false); const spanObject = { id: span[1], name: span[4], @@ -76,16 +90,17 @@ export const spanToTreeUtil = (inputSpanList: Span[]): ITraceForest => { serviceName: span[3], hasError: !!span[11], serviceColour: '', - event: span[10].map((e) => JSON.parse(e || '{}') || {}), - references: spanReferences, + event: span[10]?.map((e) => JSON.parse(e || '{}') || {}), + childReferences, + nonChildReferences, }; spanMap[span[1]] = spanObject; }); for (const [, spanData] of Object.entries(spanMap)) { - if (spanData.references) { - createTarceRootSpan(spanData.references); - spanData.references.forEach(({ SpanId: parentSpanId }) => { + if (spanData.childReferences) { + createTraceRootSpan(spanData.childReferences); + spanData.childReferences.forEach(({ SpanId: parentSpanId }) => { if (spanMap[parentSpanId]) { spanData.isProcessed = true; spanMap[parentSpanId].children.push(spanData); @@ -103,7 +118,9 @@ export const spanToTreeUtil = (inputSpanList: Span[]): ITraceForest => { const missingSpanTree: ITraceTree[] = []; const referencedTraceIds: string[] = Array.from(traceIdSet); Object.keys(spanMap).forEach((spanId) => { - const isRoot = spanMap[spanId].references?.some((refs) => refs.SpanId === ''); + const isRoot = spanMap[spanId].childReferences?.some( + (refs) => refs.SpanId === '', + ); if (isRoot) { spanTree.push(spanMap[spanId]); return; From 080a53a9b4000192aa424547eb1b7106dbccd569 Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Fri, 3 Mar 2023 12:09:24 +0100 Subject: [PATCH 14/29] fix: menu antd deprecation warning (#2416) * fix: menu antd deprecation warning * chore: some of the refactoring is updated --------- Co-authored-by: gitstart Co-authored-by: palashgdev --- .../TimePreferenceDropDown/config.tsx | 8 ++ .../TimePreferenceDropDown/index.tsx | 13 +-- .../container/ConfigDropdown/Config/index.tsx | 47 +++++----- .../container/ConfigDropdown/Config/styles.ts | 15 +++- .../src/container/ConfigDropdown/index.tsx | 20 +++-- .../src/container/ListOfDashboard/index.tsx | 60 ++++++------- frontend/src/container/SideNav/index.tsx | 90 +++++++++++-------- 7 files changed, 143 insertions(+), 110 deletions(-) create mode 100644 frontend/src/components/TimePreferenceDropDown/config.tsx diff --git a/frontend/src/components/TimePreferenceDropDown/config.tsx b/frontend/src/components/TimePreferenceDropDown/config.tsx new file mode 100644 index 0000000000..bf09498ec7 --- /dev/null +++ b/frontend/src/components/TimePreferenceDropDown/config.tsx @@ -0,0 +1,8 @@ +import { Typography } from 'antd'; +import { timeItems } from 'container/NewWidget/RightContainer/timeItems'; +import React from 'react'; + +export const menuItems = timeItems.map((item) => ({ + key: item.enum, + label: {item.name}, +})); diff --git a/frontend/src/components/TimePreferenceDropDown/index.tsx b/frontend/src/components/TimePreferenceDropDown/index.tsx index 0f9a06bc10..8774edbdc9 100644 --- a/frontend/src/components/TimePreferenceDropDown/index.tsx +++ b/frontend/src/components/TimePreferenceDropDown/index.tsx @@ -1,10 +1,11 @@ -import { Button, Dropdown, Menu, Typography } from 'antd'; +import { Button, Dropdown, Menu } from 'antd'; import TimeItems, { timePreferance, timePreferenceType, } from 'container/NewWidget/RightContainer/timeItems'; import React, { useCallback } from 'react'; +import { menuItems } from './config'; import { TextContainer } from './styles'; function TimePreference({ @@ -24,15 +25,7 @@ function TimePreference({ return ( - {TimeItems.map((item) => ( - - {item.name} - - ))} - - } + overlay={} > diff --git a/frontend/src/container/ConfigDropdown/Config/index.tsx b/frontend/src/container/ConfigDropdown/Config/index.tsx index bb9bee69a8..3d356a0af4 100644 --- a/frontend/src/container/ConfigDropdown/Config/index.tsx +++ b/frontend/src/container/ConfigDropdown/Config/index.tsx @@ -6,7 +6,6 @@ import { ConfigProps } from 'types/api/dynamicConfigs/getDynamicConfigs'; import ErrorLink from './ErrorLink'; import LinkContainer from './Link'; -import { MenuItem } from './styles'; function HelpToolTip({ config }: HelpToolTipProps): JSX.Element { const sortedConfig = useMemo( @@ -16,31 +15,29 @@ function HelpToolTip({ config }: HelpToolTipProps): JSX.Element { const isDarkMode = useIsDarkMode(); - return ( - - {sortedConfig.map((item) => { - const iconName = `${isDarkMode ? item.darkIcon : item.lightIcon}`; + const items = sortedConfig.map((item) => { + const iconName = `${isDarkMode ? item.darkIcon : item.lightIcon}`; + const Component = React.lazy( + () => import(`@ant-design/icons/es/icons/${iconName}.js`), + ); + return { + key: item.text + item.href, + label: ( + + }> + + + + {item.text} + + + + + ), + }; + }); - const Component = React.lazy( - () => import(`@ant-design/icons/es/icons/${iconName}.js`), - ); - return ( - - }> - - - - - {item.text} - - - - - - ); - })} - - ); + return ; } interface HelpToolTipProps { diff --git a/frontend/src/container/ConfigDropdown/Config/styles.ts b/frontend/src/container/ConfigDropdown/Config/styles.ts index dac63b21a6..4807ea77c2 100644 --- a/frontend/src/container/ConfigDropdown/Config/styles.ts +++ b/frontend/src/container/ConfigDropdown/Config/styles.ts @@ -1,10 +1,17 @@ import { Menu } from 'antd'; import styled from 'styled-components'; -export const MenuItem = styled(Menu.Item)` +export const MenuDropdown = styled(Menu)` &&& { - height: 1.75rem; - display: flex; - align-items: center; + .ant-dropdown, + .ant-dropdown-menu, + .ant-dropdown-menu-item { + padding: 0px; + } + .ant-menu-item { + height: 1.75rem; + display: flex; + align-items: center; + } } `; diff --git a/frontend/src/container/ConfigDropdown/index.tsx b/frontend/src/container/ConfigDropdown/index.tsx index 123b8a26b8..8390e09167 100644 --- a/frontend/src/container/ConfigDropdown/index.tsx +++ b/frontend/src/container/ConfigDropdown/index.tsx @@ -4,14 +4,16 @@ import { QuestionCircleFilled, QuestionCircleOutlined, } from '@ant-design/icons'; -import { Dropdown, Menu, Space } from 'antd'; +import { Dropdown, Space } from 'antd'; import { useIsDarkMode } from 'hooks/useDarkMode'; import React, { useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; import { AppState } from 'store/reducers'; +import { ConfigProps } from 'types/api/dynamicConfigs/getDynamicConfigs'; import AppReducer from 'types/reducer/app'; import HelpToolTip from './Config'; +import { MenuDropdown } from './Config/styles'; function DynamicConfigDropdown({ frontendId, @@ -32,6 +34,16 @@ function DynamicConfigDropdown({ setIsHelpDropDownOpen(!isHelpDropDownOpen); }; + const menuItems = useMemo( + () => [ + { + key: '1', + label: , + }, + ], + [config], + ); + if (!config) { return
; } @@ -43,11 +55,7 @@ function DynamicConfigDropdown({ - -
- } + overlay={} visible={isHelpDropDownOpen} > diff --git a/frontend/src/container/ListOfDashboard/index.tsx b/frontend/src/container/ListOfDashboard/index.tsx index d3feaa0bc9..b513df0c6a 100644 --- a/frontend/src/container/ListOfDashboard/index.tsx +++ b/frontend/src/container/ListOfDashboard/index.tsx @@ -1,5 +1,6 @@ import { PlusOutlined } from '@ant-design/icons'; import { Card, Dropdown, Menu, Row, TableColumnProps, Typography } from 'antd'; +import { ItemType } from 'antd/es/menu/hooks/useItems'; import createDashboard from 'api/dashboard/create'; import { AxiosError } from 'axios'; import { ResizeTable } from 'components/ResizeTable'; @@ -188,34 +189,33 @@ function ListOfAllDashboard(): JSX.Element { setUploadedGrafana(uploadedGrafana); }; - const menu = useMemo( - () => ( - - {createNewDashboard && ( - - {t('create_dashboard')} - - )} - onModalHandler(false)} - key={t('import_json').toString()} - > - {t('import_json')} - - onModalHandler(true)} - key={t('import_grafana_json').toString()} - > - {t('import_grafana_json')} - - - ), - [createNewDashboard, loading, onNewDashboardHandler, t], - ); + const getMenuItems = useCallback(() => { + const menuItems: ItemType[] = []; + if (createNewDashboard) { + menuItems.push({ + key: t('create_dashboard').toString(), + label: t('create_dashboard'), + disabled: loading, + onClick: onNewDashboardHandler, + }); + } + + menuItems.push({ + key: t('import_json').toString(), + label: t('import_json'), + onClick: (): void => onModalHandler(false), + }); + + menuItems.push({ + key: t('import_grafana_json').toString(), + label: t('import_grafana_json'), + onClick: (): void => onModalHandler(true), + }); + + return menuItems; + }, [createNewDashboard, loading, onNewDashboardHandler, t]); + + const menuItems = getMenuItems(); const GetHeader = useMemo( () => ( @@ -230,7 +230,7 @@ function ListOfAllDashboard(): JSX.Element { }} /> {newDashboard && ( - + }> } type="primary" @@ -246,10 +246,10 @@ function ListOfAllDashboard(): JSX.Element { ), [ getText, - menu, newDashboard, newDashboardState.error, newDashboardState.loading, + menuItems, ], ); diff --git a/frontend/src/container/SideNav/index.tsx b/frontend/src/container/SideNav/index.tsx index d8da0d6f65..a033854e86 100644 --- a/frontend/src/container/SideNav/index.tsx +++ b/frontend/src/container/SideNav/index.tsx @@ -64,14 +64,16 @@ function SideNav(): JSX.Element { const isNotCurrentVersion = currentVersion !== latestVersion; - const sidebar = [ + const sidebar: SidebarItem[] = [ { onClick: onClickSlackHandler, icon: , text: Support, + key: 'slack', }, { onClick: onClickVersionHandler, + key: 'version', icon: isNotCurrentVersion ? ( ) : ( @@ -95,6 +97,32 @@ function SideNav(): JSX.Element { [pathname], ); + const items = [ + ...menus.map(({ to, Icon, name, tags }) => ({ + key: to, + icon: , + onClick: (): void => onClickHandler(to), + label: ( + +
{name}
+ {tags && + tags.map((e) => ( + + {e} + + ))} + + ), + })), + ]; + + const sidebarItems = (props: SidebarItem, index: number): SidebarItem => ({ + key: `${index}`, + icon: props.icon, + onClick: props.onClick, + label: props.text, + }); + return ( - {menus.map(({ to, Icon, name, tags }) => ( - } - onClick={(): void => onClickHandler(to)} - > - -
{name}
- {tags && - tags.map((e) => ( - - {e} - - ))} - - - ))} - {sidebar.map((props, index) => ( - - - {props.text} - - - ))} - + items={items} + /> + {sidebar.map((props, index) => ( + + + + ))} ); } +interface SidebarItem { + onClick: VoidFunction; + icon?: React.ReactNode; + text?: React.ReactNode; + key: string; + label?: React.ReactNode; +} + export default SideNav; From 2c7cefcc7458185a0f0c6523ee3ac67d28a0daae Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Fri, 3 Mar 2023 18:07:24 +0530 Subject: [PATCH 15/29] fix: add the missing /health route removed in #2261 (#2419) --- pkg/query-service/app/http_handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index eeb324f149..e948095d68 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -290,6 +290,7 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *AuthMiddleware) { router.HandleFunc("/api/v1/version", am.OpenAccess(aH.getVersion)).Methods(http.MethodGet) router.HandleFunc("/api/v1/featureFlags", am.OpenAccess(aH.getFeatureFlags)).Methods(http.MethodGet) router.HandleFunc("/api/v1/configs", am.OpenAccess(aH.getConfigs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/health", am.OpenAccess(aH.getHealth)).Methods(http.MethodGet) router.HandleFunc("/api/v1/getSpanFilters", am.ViewAccess(aH.getSpanFilters)).Methods(http.MethodPost) router.HandleFunc("/api/v1/getTagFilters", am.ViewAccess(aH.getTagFilters)).Methods(http.MethodPost) From e3fee332c764c345d5080cc430307bc06c77e517 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Fri, 3 Mar 2023 23:45:04 +0530 Subject: [PATCH 16/29] chore: update CODEOWNERS for */query-service/ (#2421) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6ea316135a..c1aa885b6a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,4 +4,4 @@ * @ankitnayan /frontend/ @palashgdev @pranshuchittora /deploy/ @prashant-shahi -/pkg/query-service/ @srikanthccv +**/query-service/ @srikanthccv From 6defa0ac8b5473278c231647c86cb32f10e4c89f Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Sat, 4 Mar 2023 00:05:16 +0530 Subject: [PATCH 17/29] feat: metric attribute autocomplete for the aggregation type (#2263) --- ee/query-service/app/server.go | 1 + .../app/clickhouseReader/reader.go | 36 ++++++ pkg/query-service/app/http_handler.go | 35 ++++++ pkg/query-service/app/parser.go | 36 +++++- pkg/query-service/app/parser_test.go | 91 +++++++++++++- pkg/query-service/app/server.go | 1 + pkg/query-service/interfaces/interface.go | 2 + pkg/query-service/model/v3/v3.go | 117 +++++++++++++++--- 8 files changed, 299 insertions(+), 20 deletions(-) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index 7a0d794a88..899cc08880 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -231,6 +231,7 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, e apiHandler.RegisterRoutes(r, am) apiHandler.RegisterMetricsRoutes(r, am) apiHandler.RegisterLogsRoutes(r, am) + apiHandler.RegisterQueryRangeV3Routes(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go index 7eb8a65674..4fc644bc8b 100644 --- a/pkg/query-service/app/clickhouseReader/reader.go +++ b/pkg/query-service/app/clickhouseReader/reader.go @@ -45,6 +45,7 @@ import ( am "go.signoz.io/signoz/pkg/query-service/integrations/alertManager" "go.signoz.io/signoz/pkg/query-service/interfaces" "go.signoz.io/signoz/pkg/query-service/model" + v3 "go.signoz.io/signoz/pkg/query-service/model/v3" "go.signoz.io/signoz/pkg/query-service/telemetry" "go.signoz.io/signoz/pkg/query-service/utils" "go.uber.org/zap" @@ -3654,6 +3655,41 @@ func (r *ClickHouseReader) QueryDashboardVars(ctx context.Context, query string) return &result, nil } +func (r *ClickHouseReader) GetMetricAggregateAttributes(ctx context.Context, req *v3.AggregateAttributeRequest) (*v3.AggregateAttributeResponse, error) { + + var query string + var err error + var rows driver.Rows + var response v3.AggregateAttributeResponse + + query = fmt.Sprintf("SELECT DISTINCT(metric_name) from %s.%s WHERE metric_name ILIKE $1", signozMetricDBName, signozTSTableName) + if req.Limit != 0 { + query = query + fmt.Sprintf(" LIMIT %d;", req.Limit) + } + rows, err = r.db.Query(ctx, query, fmt.Sprintf("%%%s%%", req.SearchText)) + + if err != nil { + zap.S().Error(err) + return nil, fmt.Errorf("error while executing query: %s", err.Error()) + } + defer rows.Close() + + var metricName string + for rows.Next() { + if err := rows.Scan(&metricName); err != nil { + return nil, fmt.Errorf("error while scanning rows: %s", err.Error()) + } + key := v3.AttributeKey{ + Key: metricName, + DataType: v3.AttributeKeyDataTypeNumber, + Type: v3.AttributeKeyTypeTag, + } + response.AttributeKeys = append(response.AttributeKeys, key) + } + + return &response, nil +} + func (r *ClickHouseReader) CheckClickHouse(ctx context.Context) error { rows, err := r.db.Query(ctx, "SELECT 1") if err != nil { diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index e948095d68..d924c498a1 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -24,6 +24,7 @@ import ( "go.signoz.io/signoz/pkg/query-service/app/parser" "go.signoz.io/signoz/pkg/query-service/auth" "go.signoz.io/signoz/pkg/query-service/constants" + v3 "go.signoz.io/signoz/pkg/query-service/model/v3" querytemplate "go.signoz.io/signoz/pkg/query-service/utils/queryTemplate" "go.signoz.io/signoz/pkg/query-service/dao" @@ -237,6 +238,11 @@ func (aH *APIHandler) RegisterMetricsRoutes(router *mux.Router, am *AuthMiddlewa subRouter.HandleFunc("/autocomplete/tagValue", am.ViewAccess(aH.metricAutocompleteTagValue)).Methods(http.MethodGet) } +func (aH *APIHandler) RegisterQueryRangeV3Routes(router *mux.Router, am *AuthMiddleware) { + subRouter := router.PathPrefix("/api/v3").Subrouter() + subRouter.HandleFunc("/autocomplete/aggregate_attributes", am.ViewAccess(aH.autocompleteAggregateAttributes)).Methods(http.MethodGet) +} + func (aH *APIHandler) Respond(w http.ResponseWriter, data interface{}) { writeHttpResponse(w, data) } @@ -2246,3 +2252,32 @@ func (aH *APIHandler) logAggregate(w http.ResponseWriter, r *http.Request) { } aH.WriteJSON(w, r, res) } + +func (aH *APIHandler) autocompleteAggregateAttributes(w http.ResponseWriter, r *http.Request) { + var response *v3.AggregateAttributeResponse + req, err := parseAggregateAttributeRequest(r) + + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil) + return + } + + switch req.DataSource { + case v3.DataSourceMetrics: + response, err = aH.reader.GetMetricAggregateAttributes(r.Context(), req) + case v3.DataSourceLogs: + // TODO: implement + case v3.DataSourceTraces: + // TODO: implement + default: + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: fmt.Errorf("invalid data source")}, nil) + return + } + + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil) + return + } + + aH.Respond(w, response) +} diff --git a/pkg/query-service/app/parser.go b/pkg/query-service/app/parser.go index 769922e519..e75e41d7d0 100644 --- a/pkg/query-service/app/parser.go +++ b/pkg/query-service/app/parser.go @@ -16,6 +16,7 @@ import ( "go.signoz.io/signoz/pkg/query-service/auth" "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/model" + v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) var allowedFunctions = []string{"count", "ratePerSec", "sum", "avg", "min", "max", "p50", "p90", "p95", "p99"} @@ -412,11 +413,11 @@ func extractTagKeys(tags []model.TagQueryParam) ([]model.TagQueryParam, error) { tag.Key = customStr[0] } if tag.Operator == model.ExistsOperator || tag.Operator == model.NotExistsOperator { - if customStr[1] == string(model.TagTypeString) + ")" { + if customStr[1] == string(model.TagTypeString)+")" { tag.StringValues = []string{" "} - } else if customStr[1] ==string(model.TagTypeBool) + ")" { + } else if customStr[1] == string(model.TagTypeBool)+")" { tag.BoolValues = []bool{true} - } else if customStr[1] == string(model.TagTypeNumber) + ")" { + } else if customStr[1] == string(model.TagTypeNumber)+")" { tag.NumberValues = []float64{0} } else { return nil, fmt.Errorf("TagKey param is not valid in query") @@ -811,3 +812,32 @@ func parseFilterSet(r *http.Request) (*model.FilterSet, error) { } return &filterSet, nil } + +func parseAggregateAttributeRequest(r *http.Request) (*v3.AggregateAttributeRequest, error) { + var req v3.AggregateAttributeRequest + + aggregateOperator := v3.AggregateOperator(r.URL.Query().Get("aggregateOperator")) + dataSource := v3.DataSource(r.URL.Query().Get("dataSource")) + aggregateAttribute := r.URL.Query().Get("searchText") + + limit, err := strconv.Atoi(r.URL.Query().Get("limit")) + if err != nil { + limit = 50 + } + + if err := aggregateOperator.Validate(); err != nil { + return nil, err + } + + if err := dataSource.Validate(); err != nil { + return nil, err + } + + req = v3.AggregateAttributeRequest{ + Operator: aggregateOperator, + SearchText: aggregateAttribute, + Limit: limit, + DataSource: dataSource, + } + return &req, nil +} diff --git a/pkg/query-service/app/parser_test.go b/pkg/query-service/app/parser_test.go index 53e08125e6..3a29303510 100644 --- a/pkg/query-service/app/parser_test.go +++ b/pkg/query-service/app/parser_test.go @@ -3,13 +3,16 @@ package app import ( "bytes" "net/http" + "net/http/httptest" + "strings" "testing" "github.com/smartystreets/assertions/should" - . "github.com/smartystreets/goconvey/convey" + "github.com/stretchr/testify/assert" "go.signoz.io/signoz/pkg/query-service/app/metrics" "go.signoz.io/signoz/pkg/query-service/model" + v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) func TestParseFilterSingleFilter(t *testing.T) { @@ -58,3 +61,89 @@ func TestParseFilterNotSupportedOp(t *testing.T) { So(err, should.BeError, "unsupported operation") }) } + +func TestParseAggregateAttrReques(t *testing.T) { + reqCases := []struct { + desc string + queryString string + expectedOperator v3.AggregateOperator + expectedDataSource v3.DataSource + expectedLimit int + expectedSearchText string + expectErr bool + errMsg string + }{ + { + desc: "valid operator and data source", + queryString: "aggregateOperator=sum&dataSource=metrics&searchText=abc", + expectedOperator: v3.AggregateOperatorSum, + expectedDataSource: v3.DataSourceMetrics, + expectedLimit: 50, + expectedSearchText: "abc", + }, + { + desc: "different valid operator and data source as logs", + queryString: "aggregateOperator=avg&dataSource=logs&searchText=abc", + expectedOperator: v3.AggregateOperatorAvg, + expectedDataSource: v3.DataSourceLogs, + expectedLimit: 50, + expectedSearchText: "abc", + }, + { + desc: "different valid operator and with default search text and limit", + queryString: "aggregateOperator=avg&dataSource=metrics", + expectedOperator: v3.AggregateOperatorAvg, + expectedDataSource: v3.DataSourceMetrics, + expectedLimit: 50, + expectedSearchText: "", + }, + { + desc: "valid operator and data source with limit", + queryString: "aggregateOperator=avg&dataSource=traces&limit=10", + expectedOperator: v3.AggregateOperatorAvg, + expectedDataSource: v3.DataSourceTraces, + expectedLimit: 10, + expectedSearchText: "", + }, + { + desc: "invalid operator", + queryString: "aggregateOperator=avg1&dataSource=traces&limit=10", + expectErr: true, + errMsg: "invalid operator", + }, + { + desc: "invalid data source", + queryString: "aggregateOperator=avg&dataSource=traces1&limit=10", + expectErr: true, + errMsg: "invalid data source", + }, + { + desc: "invalid limit", + queryString: "aggregateOperator=avg&dataSource=traces&limit=abc", + expectedOperator: v3.AggregateOperatorAvg, + expectedDataSource: v3.DataSourceTraces, + expectedLimit: 50, + }, + } + + for _, reqCase := range reqCases { + r := httptest.NewRequest("GET", "/api/v3/autocomplete/aggregate_attributes?"+reqCase.queryString, nil) + aggregateAttrRequest, err := parseAggregateAttributeRequest(r) + if reqCase.expectErr { + if err == nil { + t.Errorf("expected error: %s", reqCase.errMsg) + } + if !strings.Contains(err.Error(), reqCase.errMsg) { + t.Errorf("expected error to contain: %s, got: %s", reqCase.errMsg, err.Error()) + } + continue + } + if err != nil { + t.Errorf("unexpected error: %v", err) + } + assert.Equal(t, reqCase.expectedOperator, aggregateAttrRequest.Operator) + assert.Equal(t, reqCase.expectedDataSource, aggregateAttrRequest.DataSource) + assert.Equal(t, reqCase.expectedLimit, aggregateAttrRequest.Limit) + assert.Equal(t, reqCase.expectedSearchText, aggregateAttrRequest.SearchText) + } +} diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index c99046fac4..7981cb1b05 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -182,6 +182,7 @@ func (s *Server) createPublicServer(api *APIHandler) (*http.Server, error) { api.RegisterRoutes(r, am) api.RegisterMetricsRoutes(r, am) api.RegisterLogsRoutes(r, am) + api.RegisterQueryRangeV3Routes(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/pkg/query-service/interfaces/interface.go b/pkg/query-service/interfaces/interface.go index 1a98e5d1d7..6f0442d4ad 100644 --- a/pkg/query-service/interfaces/interface.go +++ b/pkg/query-service/interfaces/interface.go @@ -9,6 +9,7 @@ import ( "github.com/prometheus/prometheus/util/stats" am "go.signoz.io/signoz/pkg/query-service/integrations/alertManager" "go.signoz.io/signoz/pkg/query-service/model" + v3 "go.signoz.io/signoz/pkg/query-service/model/v3" ) type Reader interface { @@ -56,6 +57,7 @@ type Reader interface { GetMetricAutocompleteTagValue(ctx context.Context, params *model.MetricAutocompleteTagParams) (*[]string, *model.ApiError) GetMetricResult(ctx context.Context, query string) ([]*model.Series, error) GetMetricResultEE(ctx context.Context, query string) ([]*model.Series, string, error) + GetMetricAggregateAttributes(ctx context.Context, req *v3.AggregateAttributeRequest) (*v3.AggregateAttributeResponse, error) GetTotalSpans(ctx context.Context) (uint64, error) GetSpansInLastHeartBeatInterval(ctx context.Context) (uint64, error) diff --git a/pkg/query-service/model/v3/v3.go b/pkg/query-service/model/v3/v3.go index fc9b72075b..5bdf575a8e 100644 --- a/pkg/query-service/model/v3/v3.go +++ b/pkg/query-service/model/v3/v3.go @@ -1,6 +1,9 @@ package v3 -import "time" +import ( + "fmt" + "time" +) type DataSource string @@ -10,6 +13,15 @@ const ( DataSourceMetrics DataSource = "metrics" ) +func (d DataSource) Validate() error { + switch d { + case DataSourceTraces, DataSourceLogs, DataSourceMetrics: + return nil + default: + return fmt.Errorf("invalid data source: %s", d) + } +} + type AggregateOperator string const ( @@ -45,6 +57,44 @@ const ( AggregateOperatorHistQuant99 AggregateOperator = "hist_quantile_99" ) +func (a AggregateOperator) Validate() error { + switch a { + case AggregateOperatorNoOp, + AggregateOpeatorCount, + AggregateOperatorCountDistinct, + AggregateOperatorSum, + AggregateOperatorAvg, + AggregateOperatorMin, + AggregateOperatorMax, + AggregateOperatorP05, + AggregateOperatorP10, + AggregateOperatorP20, + AggregateOperatorP25, + AggregateOperatorP50, + AggregateOperatorP75, + AggregateOperatorP90, + AggregateOperatorP95, + AggregateOperatorP99, + AggregateOperatorRate, + AggregateOperatorSumRate, + AggregateOperatorAvgRate, + AggregateOperatorMinRate, + AggregateOperatorMaxRate, + AggregateOperatorRateSum, + AggregateOperatorRateAvg, + AggregateOperatorRateMin, + AggregateOperatorRateMax, + AggregateOperatorHistQuant50, + AggregateOperatorHistQuant75, + AggregateOperatorHistQuant90, + AggregateOperatorHistQuant95, + AggregateOperatorHistQuant99: + return nil + default: + return fmt.Errorf("invalid operator: %s", a) + } +} + type ReduceToOperator string const ( @@ -55,6 +105,15 @@ const ( ReduceToOperatorMax ReduceToOperator = "max" ) +func (r ReduceToOperator) Validate() error { + switch r { + case ReduceToOperatorLast, ReduceToOperatorSum, ReduceToOperatorAvg, ReduceToOperatorMin, ReduceToOperatorMax: + return nil + default: + return fmt.Errorf("invalid reduce to operator: %s", r) + } +} + type QueryType string const ( @@ -63,6 +122,15 @@ const ( QueryTypePromQL QueryType = "promql" ) +func (q QueryType) Validate() error { + switch q { + case QueryTypeBuilder, QueryTypeClickHouseSQL, QueryTypePromQL: + return nil + default: + return fmt.Errorf("invalid query type: %s", q) + } +} + type PanelType string const ( @@ -72,6 +140,15 @@ const ( PanelTypeList PanelType = "list" ) +func (p PanelType) Validate() error { + switch p { + case PanelTypeValue, PanelTypeGraph, PanelTypeTable, PanelTypeList: + return nil + default: + return fmt.Errorf("invalid panel type: %s", p) + } +} + // AggregateAttributeRequest is a request to fetch possible attribute keys // for a selected aggregate operator and search text. // The context of the selected aggregate operator is used as the @@ -104,26 +181,26 @@ type FilterAttributeKeyRequest struct { Limit int `json:"limit"` } -type FilterAttributeKeyDataType string +type AttributeKeyDataType string const ( - FilterAttributeKeyDataTypeString FilterAttributeKeyDataType = "string" - FilterAttributeKeyDataTypeNumber FilterAttributeKeyDataType = "number" - FilterAttributeKeyDataTypeBool FilterAttributeKeyDataType = "bool" + AttributeKeyDataTypeString AttributeKeyDataType = "string" + AttributeKeyDataTypeNumber AttributeKeyDataType = "number" + AttributeKeyDataTypeBool AttributeKeyDataType = "bool" ) // FilterAttributeValueRequest is a request to fetch possible attribute values // for a selected aggregate operator, aggregate attribute, filter attribute key // and search text. type FilterAttributeValueRequest struct { - DataSource DataSource `json:"dataSource"` - AggregateOperator AggregateOperator `json:"aggregateOperator"` - AggregateAttribute string `json:"aggregateAttribute"` - FilterAttributeKey string `json:"filterAttributeKey"` - FilterAttributeKeyDataType FilterAttributeKeyDataType `json:"filterAttributeKeyDataType"` - TagType TagType `json:"tagType"` - SearchText string `json:"searchText"` - Limit int `json:"limit"` + DataSource DataSource `json:"dataSource"` + AggregateOperator AggregateOperator `json:"aggregateOperator"` + AggregateAttribute string `json:"aggregateAttribute"` + FilterAttributeKey string `json:"filterAttributeKey"` + FilterAttributeKeyDataType AttributeKeyDataType `json:"filterAttributeKeyDataType"` + TagType TagType `json:"tagType"` + SearchText string `json:"searchText"` + Limit int `json:"limit"` } type AggregateAttributeResponse struct { @@ -134,10 +211,18 @@ type FilterAttributeKeyResponse struct { AttributeKeys []AttributeKey `json:"attributeKeys"` } +type AttributeKeyType string + +const ( + AttributeKeyTypeColumn AttributeKeyType = "column" + AttributeKeyTypeTag AttributeKeyType = "tag" + AttributeKeyTypeResource AttributeKeyType = "resource" +) + type AttributeKey struct { - Key string `json:"key"` - DataType string `json:"dataType"` - Type string `json:"type"` // "column" or "tag"/"attr"/"attribute" or "resource"? + Key string `json:"key"` + DataType AttributeKeyDataType `json:"dataType"` + Type AttributeKeyType `json:"type"` } type FilterAttributeValueResponse struct { From c5d7d9d13455810b8c00b7ac7c6f8d1a17b62895 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 7 Mar 2023 00:26:25 +0530 Subject: [PATCH 18/29] feat: ability to save and retrieve the explorer queries (#2284) --- ee/query-service/app/server.go | 3 + pkg/query-service/app/explorer/db.go | 155 ++++++++++++++++++++++++ pkg/query-service/app/http_handler.go | 83 +++++++++++++ pkg/query-service/app/server.go | 2 + pkg/query-service/model/v3/v3.go | 162 ++++++++++++++++++++++++++ 5 files changed, 405 insertions(+) create mode 100644 pkg/query-service/app/explorer/db.go diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index 899cc08880..af4a90f885 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -27,7 +27,9 @@ import ( baseapp "go.signoz.io/signoz/pkg/query-service/app" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + "go.signoz.io/signoz/pkg/query-service/app/explorer" baseauth "go.signoz.io/signoz/pkg/query-service/auth" + "go.signoz.io/signoz/pkg/query-service/constants" baseconst "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/healthcheck" basealm "go.signoz.io/signoz/pkg/query-service/integrations/alertManager" @@ -84,6 +86,7 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) { } localDB, err := dashboards.InitDB(baseconst.RELATIONAL_DATASOURCE_PATH) + explorer.InitWithDSN(constants.RELATIONAL_DATASOURCE_PATH) if err != nil { return nil, err diff --git a/pkg/query-service/app/explorer/db.go b/pkg/query-service/app/explorer/db.go new file mode 100644 index 0000000000..d7b1193508 --- /dev/null +++ b/pkg/query-service/app/explorer/db.go @@ -0,0 +1,155 @@ +package explorer + +import ( + "encoding/json" + "fmt" + "time" + + "github.com/google/uuid" + "github.com/jmoiron/sqlx" + v3 "go.signoz.io/signoz/pkg/query-service/model/v3" +) + +var db *sqlx.DB + +type ExplorerQuery struct { + UUID string `json:"uuid" db:"uuid"` + CreatedAt time.Time `json:"created_at" db:"created_at"` + UpdatedAt time.Time `json:"updated_at" db:"updated_at"` + SourcePage string `json:"source_page" db:"source_page"` + // 0 - false, 1 - true + IsView int8 `json:"is_view" db:"is_view"` + Data string `json:"data" db:"data"` + ExtraData string `json:"extra_data" db:"extra_data"` +} + +// InitWithDSN sets up setting up the connection pool global variable. +func InitWithDSN(dataSourceName string) (*sqlx.DB, error) { + var err error + + db, err = sqlx.Open("sqlite3", dataSourceName) + if err != nil { + return nil, err + } + + tableSchema := `CREATE TABLE IF NOT EXISTS explorer_queries ( + uuid TEXT PRIMARY KEY, + created_at datetime NOT NULL, + updated_at datetime NOT NULL, + source_page TEXT NOT NULL, + is_view INTEGER NOT NULL, + data TEXT NOT NULL, + extra_data TEXT + );` + + _, err = db.Exec(tableSchema) + if err != nil { + return nil, fmt.Errorf("Error in creating explorer queries table: %s", err.Error()) + } + + return db, nil +} + +func InitWithDB(sqlDB *sqlx.DB) { + db = sqlDB +} + +func GetQueries() ([]*v3.ExplorerQuery, error) { + var queries []ExplorerQuery + err := db.Select(&queries, "SELECT * FROM explorer_queries") + if err != nil { + return nil, fmt.Errorf("Error in getting explorer queries: %s", err.Error()) + } + + var explorerQueries []*v3.ExplorerQuery + for _, query := range queries { + var compositeQuery v3.CompositeQuery + err = json.Unmarshal([]byte(query.Data), &compositeQuery) + if err != nil { + return nil, fmt.Errorf("Error in unmarshalling explorer query data: %s", err.Error()) + } + explorerQueries = append(explorerQueries, &v3.ExplorerQuery{ + UUID: query.UUID, + SourcePage: query.SourcePage, + CompositeQuery: &compositeQuery, + IsView: query.IsView, + ExtraData: query.ExtraData, + }) + } + return explorerQueries, nil +} + +func CreateQuery(query v3.ExplorerQuery) (string, error) { + data, err := json.Marshal(query.CompositeQuery) + if err != nil { + return "", fmt.Errorf("Error in marshalling explorer query data: %s", err.Error()) + } + + uuid_ := query.UUID + + if uuid_ == "" { + uuid_ = uuid.New().String() + } + createdAt := time.Now() + updatedAt := time.Now() + + _, err = db.Exec( + "INSERT INTO explorer_queries (uuid, created_at, updated_at, source_page, is_view, data, extra_data) VALUES (?, ?, ?, ?, ?, ?, ?)", + uuid_, + createdAt, + updatedAt, + query.SourcePage, + query.IsView, + data, + query.ExtraData, + ) + if err != nil { + return "", fmt.Errorf("Error in creating explorer query: %s", err.Error()) + } + return uuid_, nil +} + +func GetQuery(uuid_ string) (*v3.ExplorerQuery, error) { + var query ExplorerQuery + err := db.Get(&query, "SELECT * FROM explorer_queries WHERE uuid = ?", uuid_) + if err != nil { + return nil, fmt.Errorf("Error in getting explorer query: %s", err.Error()) + } + + var compositeQuery v3.CompositeQuery + err = json.Unmarshal([]byte(query.Data), &compositeQuery) + if err != nil { + return nil, fmt.Errorf("Error in unmarshalling explorer query data: %s", err.Error()) + } + return &v3.ExplorerQuery{ + UUID: query.UUID, + SourcePage: query.SourcePage, + CompositeQuery: &compositeQuery, + IsView: query.IsView, + ExtraData: query.ExtraData, + }, nil +} + +func UpdateQuery(uuid_ string, query v3.ExplorerQuery) error { + data, err := json.Marshal(query.CompositeQuery) + if err != nil { + return fmt.Errorf("Error in marshalling explorer query data: %s", err.Error()) + } + + updatedAt := time.Now() + + _, err = db.Exec("UPDATE explorer_queries SET updated_at = ?, source_page = ?, is_view = ?, data = ?, extra_data = ? WHERE uuid = ?", + updatedAt, query.SourcePage, query.IsView, data, query.ExtraData, uuid_) + if err != nil { + return fmt.Errorf("Error in updating explorer query: %s", err.Error()) + } + return nil +} + +func DeleteQuery(uuid_ string) error { + _, err := db.Exec("DELETE FROM explorer_queries WHERE uuid = ?", uuid_) + if err != nil { + return fmt.Errorf("Error in deleting explorer query: %s", err.Error()) + } + return nil +} diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index d924c498a1..eb8409d239 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -19,6 +19,7 @@ import ( _ "github.com/mattn/go-sqlite3" "github.com/prometheus/prometheus/promql" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + "go.signoz.io/signoz/pkg/query-service/app/explorer" "go.signoz.io/signoz/pkg/query-service/app/logs" "go.signoz.io/signoz/pkg/query-service/app/metrics" "go.signoz.io/signoz/pkg/query-service/app/parser" @@ -280,6 +281,12 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *AuthMiddleware) { router.HandleFunc("/api/v1/variables/query", am.ViewAccess(aH.queryDashboardVars)).Methods(http.MethodGet) router.HandleFunc("/api/v2/variables/query", am.ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/explorer/queries", am.ViewAccess(aH.getExplorerQueries)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/explorer/queries", am.EditAccess(aH.createExplorerQueries)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/explorer/queries/{queryId}", am.ViewAccess(aH.getExplorerQuery)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/explorer/queries/{queryId}", am.EditAccess(aH.updateExplorerQuery)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/explorer/queries/{queryId}", am.EditAccess(aH.deleteExplorerQuery)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/feedback", am.OpenAccess(aH.submitFeedback)).Methods(http.MethodPost) // router.HandleFunc("/api/v1/get_percentiles", aH.getApplicationPercentiles).Methods(http.MethodGet) router.HandleFunc("/api/v1/services", am.ViewAccess(aH.getServices)).Methods(http.MethodPost) @@ -2253,6 +2260,82 @@ func (aH *APIHandler) logAggregate(w http.ResponseWriter, r *http.Request) { aH.WriteJSON(w, r, res) } +func (aH *APIHandler) getExplorerQueries(w http.ResponseWriter, r *http.Request) { + queries, err := explorer.GetQueries() + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil) + return + } + aH.Respond(w, queries) +} + +func (aH *APIHandler) createExplorerQueries(w http.ResponseWriter, r *http.Request) { + var query v3.ExplorerQuery + err := json.NewDecoder(r.Body).Decode(&query) + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil) + return + } + // validate the query + if err := query.Validate(); err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil) + return + } + uuid, err := explorer.CreateQuery(query) + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil) + return + } + + aH.Respond(w, uuid) +} + +func (aH *APIHandler) getExplorerQuery(w http.ResponseWriter, r *http.Request) { + queryID := mux.Vars(r)["queryId"] + query, err := explorer.GetQuery(queryID) + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil) + return + } + + aH.Respond(w, query) +} + +func (aH *APIHandler) updateExplorerQuery(w http.ResponseWriter, r *http.Request) { + queryID := mux.Vars(r)["queryId"] + var query v3.ExplorerQuery + err := json.NewDecoder(r.Body).Decode(&query) + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil) + return + } + // validate the query + if err := query.Validate(); err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil) + return + } + + err = explorer.UpdateQuery(queryID, query) + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil) + return + } + + aH.Respond(w, query) +} + +func (aH *APIHandler) deleteExplorerQuery(w http.ResponseWriter, r *http.Request) { + + queryID := mux.Vars(r)["queryId"] + err := explorer.DeleteQuery(queryID) + if err != nil { + RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil) + return + } + + aH.Respond(w, nil) +} + func (aH *APIHandler) autocompleteAggregateAttributes(w http.ResponseWriter, r *http.Request) { var response *v3.AggregateAttributeResponse req, err := parseAggregateAttributeRequest(r) diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index 7981cb1b05..8088c2294e 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -20,6 +20,7 @@ import ( "github.com/soheilhy/cmux" "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + "go.signoz.io/signoz/pkg/query-service/app/explorer" "go.signoz.io/signoz/pkg/query-service/auth" "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/dao" @@ -77,6 +78,7 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) { } localDB, err := dashboards.InitDB(constants.RELATIONAL_DATASOURCE_PATH) + explorer.InitWithDSN(constants.RELATIONAL_DATASOURCE_PATH) if err != nil { return nil, err diff --git a/pkg/query-service/model/v3/v3.go b/pkg/query-service/model/v3/v3.go index 5bdf575a8e..e097fdd6f1 100644 --- a/pkg/query-service/model/v3/v3.go +++ b/pkg/query-service/model/v3/v3.go @@ -3,6 +3,8 @@ package v3 import ( "fmt" "time" + + "github.com/google/uuid" ) type DataSource string @@ -95,6 +97,19 @@ func (a AggregateOperator) Validate() error { } } +// RequireAttribute returns true if the aggregate operator requires an attribute +// to be specified. +func (a AggregateOperator) RequireAttribute() bool { + switch a { + case AggregateOperatorNoOp, + AggregateOpeatorCount, + AggregateOperatorCountDistinct: + return false + default: + return true + } +} + type ReduceToOperator string const ( @@ -245,11 +260,35 @@ type PromQuery struct { Disabled bool `json:"disabled"` } +func (p *PromQuery) Validate() error { + if p == nil { + return nil + } + + if p.Query == "" { + return fmt.Errorf("query is empty") + } + + return nil +} + type ClickHouseQuery struct { Query string `json:"query"` Disabled bool `json:"disabled"` } +func (c *ClickHouseQuery) Validate() error { + if c == nil { + return nil + } + + if c.Query == "" { + return fmt.Errorf("query is empty") + } + + return nil +} + type CompositeQuery struct { BuilderQueries map[string]*BuilderQuery `json:"builderQueries,omitempty"` ClickHouseQueries map[string]*ClickHouseQuery `json:"chQueries,omitempty"` @@ -258,6 +297,50 @@ type CompositeQuery struct { QueryType QueryType `json:"queryType"` } +func (c *CompositeQuery) Validate() error { + if c == nil { + return nil + } + + if c.BuilderQueries == nil && c.ClickHouseQueries == nil && c.PromQueries == nil { + return fmt.Errorf("composite query must contain at least one query") + } + + if c.BuilderQueries != nil { + for name, query := range c.BuilderQueries { + if err := query.Validate(); err != nil { + return fmt.Errorf("builder query %s is invalid: %w", name, err) + } + } + } + + if c.ClickHouseQueries != nil { + for name, query := range c.ClickHouseQueries { + if err := query.Validate(); err != nil { + return fmt.Errorf("clickhouse query %s is invalid: %w", name, err) + } + } + } + + if c.PromQueries != nil { + for name, query := range c.PromQueries { + if err := query.Validate(); err != nil { + return fmt.Errorf("prom query %s is invalid: %w", name, err) + } + } + } + + if err := c.PanelType.Validate(); err != nil { + return fmt.Errorf("panel type is invalid: %w", err) + } + + if err := c.QueryType.Validate(); err != nil { + return fmt.Errorf("query type is invalid: %w", err) + } + + return nil +} + type BuilderQuery struct { QueryName string `json:"queryName"` DataSource DataSource `json:"dataSource"` @@ -276,11 +359,61 @@ type BuilderQuery struct { SelectColumns []string `json:"selectColumns,omitempty"` } +func (b *BuilderQuery) Validate() error { + if b == nil { + return nil + } + if b.QueryName == "" { + return fmt.Errorf("query name is required") + } + + // if expression is same as query name, it's a simple builder query and not a formula + // formula involves more than one data source, aggregate operator, etc. + if b.QueryName == b.Expression { + if err := b.DataSource.Validate(); err != nil { + return fmt.Errorf("data source is invalid: %w", err) + } + if err := b.AggregateOperator.Validate(); err != nil { + return fmt.Errorf("aggregate operator is invalid: %w", err) + } + if b.AggregateAttribute == "" && b.AggregateOperator.RequireAttribute() { + return fmt.Errorf("aggregate attribute is required") + } + } + + if b.Filters != nil { + if err := b.Filters.Validate(); err != nil { + return fmt.Errorf("filters are invalid: %w", err) + } + } + if b.GroupBy != nil { + for _, groupBy := range b.GroupBy { + if groupBy == "" { + return fmt.Errorf("group by cannot be empty") + } + } + } + if b.Expression == "" { + return fmt.Errorf("expression is required") + } + return nil +} + type FilterSet struct { Operator string `json:"op,omitempty"` Items []FilterItem `json:"items"` } +func (f *FilterSet) Validate() error { + if f == nil { + return nil + } + if f.Operator != "" && f.Operator != "AND" && f.Operator != "OR" { + return fmt.Errorf("operator must be AND or OR") + } + return nil +} + type FilterItem struct { Key string `json:"key"` Value interface{} `json:"value"` @@ -323,3 +456,32 @@ type Point struct { Timestamp int64 `json:"timestamp"` Value float64 `json:"value"` } + +// ExploreQuery is a query for the explore page +// It is a composite query with a source page name +// The source page name is used to identify the page that initiated the query +// The source page could be "traces", "logs", "metrics" or "dashboards", "alerts" etc. +type ExplorerQuery struct { + UUID string `json:"uuid,omitempty"` + SourcePage string `json:"sourcePage"` + CompositeQuery *CompositeQuery `json:"compositeQuery"` + // ExtraData is JSON encoded data used by frontend to store additional data + ExtraData string `json:"extraData"` + // 0 - false, 1 - true; this is int8 because sqlite doesn't support bool + IsView int8 `json:"isView"` +} + +func (eq *ExplorerQuery) Validate() error { + if eq.IsView != 0 && eq.IsView != 1 { + return fmt.Errorf("isView must be 0 or 1") + } + + if eq.CompositeQuery == nil { + return fmt.Errorf("composite query is required") + } + + if eq.UUID == "" { + eq.UUID = uuid.New().String() + } + return eq.CompositeQuery.Validate() +} From 3f5171dc69f64a279c5aef9994b88ddfaba4cda5 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 7 Mar 2023 13:37:31 +0530 Subject: [PATCH 19/29] chore: bump SigNoz/prometheus (#2094) --- .gitignore | 4 +- Makefile | 1 + ee/query-service/Dockerfile | 2 +- go.mod | 160 +++--- go.sum | 489 ++++++++++-------- pkg/query-service/Dockerfile | 2 +- .../app/clickhouseReader/reader.go | 60 ++- pkg/query-service/app/http_handler_test.go | 2 +- pkg/query-service/model/response.go | 10 +- pkg/query-service/pqlEngine/engine.go | 44 +- pkg/query-service/rules/promRule.go | 6 +- pkg/query-service/rules/promRuleTask.go | 9 +- pkg/query-service/utils/labels/interface.go | 2 +- pkg/query-service/utils/labels/labels.go | 30 +- 14 files changed, 452 insertions(+), 369 deletions(-) diff --git a/.gitignore b/.gitignore index 9e422ac336..d52cb94568 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,6 @@ ee/query-service/tests/test-deploy/data/ *.db /deploy/docker/clickhouse-setup/data/ /deploy/docker-swarm/clickhouse-setup/data/ -bin/ \ No newline at end of file +bin/ + +*/query-service/queries.active diff --git a/Makefile b/Makefile index d363e7039f..6b408d1488 100644 --- a/Makefile +++ b/Makefile @@ -138,3 +138,4 @@ clear-swarm-data: test: go test ./pkg/query-service/app/metrics/... + go test ./pkg/query-service/app/... diff --git a/ee/query-service/Dockerfile b/ee/query-service/Dockerfile index 7def5c0982..cfdee0cb6d 100644 --- a/ee/query-service/Dockerfile +++ b/ee/query-service/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17-buster AS builder +FROM golang:1.18-buster AS builder # LD_FLAGS is passed as argument from Makefile. It will be empty, if no argument passed ARG LD_FLAGS diff --git a/go.mod b/go.mod index abe0af8311..490ecb53d7 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module go.signoz.io/signoz -go 1.17 +go 1.18 require ( - github.com/ClickHouse/clickhouse-go/v2 v2.0.12 + github.com/ClickHouse/clickhouse-go/v2 v2.5.1 github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb github.com/coreos/go-oidc/v3 v3.4.0 - github.com/go-kit/log v0.1.0 + github.com/go-kit/log v0.2.1 github.com/google/uuid v1.3.0 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 @@ -14,30 +14,58 @@ require ( github.com/jmoiron/sqlx v1.3.4 github.com/json-iterator/go v1.1.12 github.com/mailru/easyjson v0.7.7 - github.com/mattn/go-sqlite3 v1.14.8 + github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/minio/minio-go/v6 v6.0.57 github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/oklog v0.3.2 github.com/pkg/errors v0.9.1 github.com/posthog/posthog-go v0.0.0-20220817142604-0b0bbf0f9c0f - github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 + github.com/prometheus/common v0.39.0 github.com/prometheus/prometheus v2.5.0+incompatible - github.com/rs/cors v1.7.0 + github.com/rs/cors v1.8.2 github.com/russellhaering/gosaml2 v0.8.0 github.com/russellhaering/goxmldsig v1.2.0 github.com/sethvargo/go-password v0.2.0 github.com/smartystreets/goconvey v1.6.4 - github.com/soheilhy/cmux v0.1.4 - go.uber.org/zap v1.16.0 + github.com/soheilhy/cmux v0.1.5 + go.uber.org/zap v1.24.0 gopkg.in/segmentio/analytics-go.v3 v3.1.0 - k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d + k8s.io/apimachinery v0.26.0 ) require ( - cloud.google.com/go/compute v1.7.0 // indirect + github.com/benbjohnson/clock v1.3.0 // indirect + github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect + github.com/dennwc/varint v1.0.0 // indirect + github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect + github.com/edsrzf/mmap-go v1.1.0 // indirect + github.com/go-faster/city v1.0.1 // indirect + github.com/go-faster/errors v0.6.1 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/swag v0.22.1 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect + github.com/jpillora/backoff v1.0.0 // indirect + github.com/klauspost/compress v1.15.13 // indirect + github.com/prometheus/common/sigv4 v0.1.0 // indirect + github.com/segmentio/asm v1.2.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect + go.opentelemetry.io/otel/metric v0.34.0 // indirect + go.uber.org/goleak v1.2.0 // indirect + golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 // indirect + k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect +) + +require ( + github.com/ClickHouse/ch-go v0.51.0 // indirect + github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect + github.com/andybalholm/brotli v1.0.4 // indirect + github.com/armon/go-metrics v0.4.0 // indirect github.com/beevik/etree v1.1.0 // indirect - github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect - github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect github.com/jonboulle/clockwork v0.2.2 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/klauspost/cpuid v1.2.3 // indirect @@ -45,110 +73,66 @@ require ( github.com/minio/md5-simd v1.1.0 // indirect github.com/minio/sha256-simd v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v0.9.0-pre1.0.20181001174001-0a8115f42e03 // indirect - github.com/prometheus/tsdb v0.0.0-20181003080831-0ce41118ed20 // indirect - gopkg.in/ini.v1 v1.42.0 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) require ( - github.com/Azure/azure-sdk-for-go v5.0.0-beta.0.20161028183111-bd73d950fa44+incompatible // indirect - github.com/Azure/go-autorest v10.8.1+incompatible // indirect github.com/OneOfOne/xxhash v1.2.8 // indirect - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect github.com/auth0/go-jwt-middleware v1.0.1 - github.com/aws/aws-sdk-go v1.27.0 // indirect + github.com/aws/aws-sdk-go v1.44.159 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect github.com/cespare/xxhash v1.1.0 github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-kit/kit v0.4.1-0.20170517165212-6964666de57c - github.com/go-logfmt/logfmt v0.5.0 // indirect - github.com/go-stack/stack v1.8.0 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/go-kit/kit v0.12.0 + github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/golang/glog v0.0.0-20210429001901-424d2337a529 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/btree v1.0.0 // indirect - github.com/google/gofuzz v1.2.0 // indirect - github.com/googleapis/gax-go/v2 v2.4.0 // indirect - github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4 // indirect - github.com/gophercloud/gophercloud v0.0.0-20170607034829-caf34a65f602 // indirect github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/gosimple/unidecode v1.0.0 // indirect - github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/hashicorp/consul v1.1.1-0.20180615161029-bed22a81e9fd // indirect - github.com/hashicorp/go-cleanhttp v0.5.0 // indirect - github.com/hashicorp/go-immutable-radix v1.0.0 // indirect - github.com/hashicorp/go-msgpack v1.1.5 // indirect - github.com/hashicorp/go-multierror v1.1.0 // indirect - github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 // indirect - github.com/hashicorp/go-sockaddr v1.0.0 // indirect - github.com/hashicorp/go-uuid v1.0.2 // indirect - github.com/hashicorp/golang-lru v0.5.1 // indirect - github.com/hashicorp/memberlist v0.1.0 // indirect - github.com/hashicorp/serf v0.8.1-0.20161007004122-1d4fa605f6ff // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/lib/pq v1.10.0 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect - github.com/miekg/dns v1.0.4 // indirect + github.com/lib/pq v1.10.7 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect + github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/oklog/run v1.1.0 // indirect - github.com/oklog/ulid v0.3.1-0.20170117200651-66bb6560562f // indirect - github.com/opentracing/opentracing-go v1.1.0 - github.com/pascaldekloe/goe v0.1.0 // indirect - github.com/paulmach/orb v0.4.0 // indirect - github.com/peterbourgon/diskv v2.0.2-0.20180312054125-0646ccaebea1+incompatible // indirect - github.com/pierrec/lz4/v4 v4.1.14 // indirect - github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect - github.com/prometheus/procfs v0.0.8 // indirect - github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da // indirect - github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect + github.com/oklog/ulid v1.3.1 // indirect + github.com/opentracing/opentracing-go v1.2.0 + github.com/paulmach/orb v0.8.0 // indirect + github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect github.com/segmentio/backo-go v1.0.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/sirupsen/logrus v1.8.1 // indirect + github.com/sirupsen/logrus v1.9.0 // indirect github.com/smartystreets/assertions v1.1.0 github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/spf13/pflag v1.0.3 // indirect - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.1 github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect - go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.4.1 // indirect - go.opentelemetry.io/otel/trace v1.4.1 // indirect - go.uber.org/atomic v1.6.0 // indirect - go.uber.org/multierr v1.5.0 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 - golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b - golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect - google.golang.org/api v0.84.0 // indirect + go.opentelemetry.io/otel v1.11.2 // indirect + go.opentelemetry.io/otel/trace v1.11.2 // indirect + go.uber.org/atomic v1.10.0 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/crypto v0.1.0 + golang.org/x/net v0.4.0 + golang.org/x/oauth2 v0.3.0 + golang.org/x/sync v0.1.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect + golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect - google.golang.org/grpc v1.47.0 - google.golang.org/grpc/examples v0.0.0-20210803221256-6ba56c814be7 // indirect - google.golang.org/protobuf v1.28.0 // indirect - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect - gopkg.in/inf.v0 v0.9.1 // indirect + google.golang.org/grpc v1.51.0 + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0-20180628040859-072894a440bd // indirect - k8s.io/client-go v8.0.0+incompatible // indirect ) -replace github.com/prometheus/prometheus => github.com/SigNoz/prometheus v1.9.77 +replace github.com/prometheus/prometheus => github.com/SigNoz/prometheus v1.9.77-0.2 diff --git a/go.sum b/go.sum index ced3aa86b9..f437e8cf4c 100644 --- a/go.sum +++ b/go.sum @@ -27,7 +27,6 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= -cloud.google.com/go v0.102.0 h1:DAq3r8y4mDgyB/ZPJ9v/5VJNqjgJAxTn6ZYLlUywOu8= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= @@ -40,7 +39,6 @@ cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJW cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= -cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= @@ -56,53 +54,70 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-sdk-for-go v5.0.0-beta.0.20161028183111-bd73d950fa44+incompatible h1:+5hx+ZckahrubYyxbjTwnq9w5xpnq1CwSL4N54I8/qc= -github.com/Azure/azure-sdk-for-go v5.0.0-beta.0.20161028183111-bd73d950fa44+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/go-autorest v10.8.1+incompatible h1:u0jVQf+a6k6x8A+sT60l6EY9XZu+kHdnZVPAYqpVRo0= -github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= +github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= +github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM= +github.com/Azure/go-autorest/autorest/adal v0.9.21 h1:jjQnVFXPfekaqb8vIsv2G1lxshoW+oGv4MDlhRtnYZk= +github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= +github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= +github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= +github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= +github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= 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/ClickHouse/clickhouse-go v1.5.3 h1:Vok8zUb/wlqc9u8oEqQzBMBRDoFd8NxPRqgYEqMnV88= -github.com/ClickHouse/clickhouse-go v1.5.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= -github.com/ClickHouse/clickhouse-go/v2 v2.0.12 h1:Nbl/NZwoM6LGJm7smNBgvtdr/rxjlIssSW3eG/Nmb9E= -github.com/ClickHouse/clickhouse-go/v2 v2.0.12/go.mod h1:u4RoNQLLM2W6hNSPYrIESLJqaWSInZVmfM+MlaAhXcg= +github.com/ClickHouse/ch-go v0.51.0 h1:APpjlLifKMgRp1b94cujX7dRZLL4DjbtMVs7qRoUPqg= +github.com/ClickHouse/ch-go v0.51.0/go.mod h1:laZ+vBk0hO3UBQblUXqECDcy71K+/tcIfs7ZjN0evgc= +github.com/ClickHouse/clickhouse-go/v2 v2.5.1 h1:+KebkZtGJKaCilgNF0vQBrc7hOdNWnheue0bX1OVhl4= +github.com/ClickHouse/clickhouse-go/v2 v2.5.1/go.mod h1:21ga8MAMxWl6AKFJTaoT/ur/zIo8OJccxj/5bF8T9SE= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb h1:bneLSKPf9YUSFmafKx32bynV6QrzViL/s+ZDvQxH1E4= github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb/go.mod h1:JznGDNg9x1cujDKa22RaQOimOvvEfy3nxzDGd8XDgmA= -github.com/SigNoz/prometheus v1.9.77 h1:We3pxbCnCRWQE7tSELBkcmneiXRtcpOlXrGtLPVQ1v0= -github.com/SigNoz/prometheus v1.9.77/go.mod h1:Y4J9tGDmacMC+EcOTp+EIAn2C1sN+9kE+idyVKadiVM= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/SigNoz/prometheus v1.9.77-0.2 h1:y5HpJR6RYkOd5ysP9rSsLgoGMj0A7EvP5cbqp5XY0Mc= +github.com/SigNoz/prometheus v1.9.77-0.2/go.mod h1:bT6BCBpZQA4qOO8oJPvcZr80XpbZcn7go6503fxpYj4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= +github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= +github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/auth0/go-jwt-middleware v1.0.1 h1:/fsQ4vRr4zod1wKReUH+0A3ySRjGiT9G34kypO/EKwI= github.com/auth0/go-jwt-middleware v1.0.1/go.mod h1:YSeUX3z6+TF2H+7padiEqNJ73Zy9vXW72U//IgN0BIM= -github.com/aws/aws-sdk-go v1.13.44-0.20180507225419-00862f899353/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= -github.com/aws/aws-sdk-go v1.27.0 h1:0xphMHGMLBrPMfxR2AmVjZKcMEESEgWF8Kru94BNByk= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.44.159 h1:9odtuHAYQE9tQKyuX6ny1U1MHeH5/yzeCJi96g9H4DU= +github.com/aws/aws-sdk-go v1.44.159/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs= github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A= -github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +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/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v0.0.0-20161118035902-4a94f899c20b/go.mod h1:fX/lfQBkSCDXZSUgv6jVIu/EVA3/JNseAX5asI4c4T4= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -112,8 +127,7 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292/go.mod h1:qRiX68mZX1lGBkTWyp3CLcenw9I94W2dLeRvMzcn9N4= -github.com/cockroachdb/cockroach v0.0.0-20170608034007-84bc9597164f/go.mod h1:xeT/CQ0qZHangbYbWShlCGAx31aV4AjGswDUjhKS6HQ= +github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc h1:PYXxkRUBGUMa5xgMVMDl62vEklZvKpVaxQeN9ie7Hfk= github.com/coreos/go-oidc/v3 v3.4.0 h1:xz7elHb/LDwm/ERpwHd+5nb7wFHL32rsr6bBOgaeu6g= github.com/coreos/go-oidc/v3 v3.4.0/go.mod h1:eHUXhZtXPQLgEaDrOVTgwbgmz1xGOkJNye6h3zkD2Pw= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -121,11 +135,18 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 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/dgrijalva/jwt-go v3.0.1-0.20161101193935-9ed569b5d1ac+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-bits v0.0.0-20160601073636-2ad8d707cc05/go.mod h1:/9UYwwvZuEgp+mQ4960SHWCU1FS+FgdFX+m5ExFByNs= +github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= +github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= +github.com/digitalocean/godo v1.91.1 h1:1o30VOCu1aC6488qBd0SkQiBeAZ35RSTvLwCA1pQMhc= +github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= +github.com/docker/docker v20.10.22+incompatible h1:6jX4yB+NtcbldT90k7vBSaWJDB3i+zkVJT9BEK8kQkk= +github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 h1:IPrmumsT9t5BS7XcPhgsCTlkWbYg80SEXUzDpReaU6Y= +github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11/go.mod h1:a6bNUGTbQBsY6VRHTr4h/rkOXjl244DyRD0tx3fgq4Q= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= +github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -135,47 +156,62 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/go-control-plane v0.10.3 h1:xdCVXxEe0Y3FQith+0cj2irwZudqGYvecuLB1HtdexY= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= +github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -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/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= +github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= +github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= +github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI= +github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.21.1/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= -github.com/go-kit/kit v0.4.1-0.20170517165212-6964666de57c h1:lGtNy7NU/+ytYPPneoErOaNrYkF5DOVCYViUK/7t7XA= -github.com/go-kit/kit v0.4.1-0.20170517165212-6964666de57c/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= +github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/swag v0.22.1 h1:S6xFhsBKAtvfphnJwRzeCh3OEGsTL/crXdEetSxLs0Q= +github.com/go-openapi/swag v0.22.1/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.5.4/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v0.0.0-20210429001901-424d2337a529 h1:2voWjNECnrZRbfwXxHB1/j8wa6xdKn85B5NzgVL/pTU= -github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -203,14 +239,12 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20160529050041-d9eb7a3d35ec/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= 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/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -224,16 +258,15 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20180605153948-8b03ce837f34/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= 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/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -252,7 +285,6 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa h1:7MYGT2XEMam7Mtzv1yDUYXANedWvwk3HKkR3MyGowy8= github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= @@ -260,90 +292,79 @@ github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pf github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= -github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= -github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4 h1:Z09Qt6AGDtg0cC/YgnX/iymzIqmZf5aasP5JZFxmkNQ= -github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= -github.com/gophercloud/gophercloud v0.0.0-20170607034829-caf34a65f602 h1:Acc1d6mIuURCyYN6nkm1d7+Gycfq1+jUWdnBbTyGb6E= -github.com/gophercloud/gophercloud v0.0.0-20170607034829-caf34a65f602/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gophercloud/gophercloud v1.1.1 h1:MuGyqbSxiuVBqkPZ3+Nhbytk1xZxhmfCB2Rg1cJWFWM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gosimple/slug v1.10.0 h1:3XbiQua1IpCdrvuntWvGBxVm+K99wCSxJjlxkP49GGQ= github.com/gosimple/slug v1.10.0/go.mod h1:MICb3w495l9KNdZm+Xn5b6T2Hn831f9DMxiJ1r+bAjw= github.com/gosimple/unidecode v1.0.0 h1:kPdvM+qy0tnk4/BrnkrbdJ82xe88xn7c9hcaipDz4dQ= github.com/gosimple/unidecode v1.0.0/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww= +github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul v1.1.1-0.20180615161029-bed22a81e9fd h1:u6o+bd6FHxDKoCSa8PJ5vrHhAYSKgJtAHQtLO1EYgos= github.com/hashicorp/consul v1.1.1-0.20180615161029-bed22a81e9fd/go.mod h1:mFrjN1mfidgJfYP1xrJCF+AfRhr6Eaqhb2+sfyn/OOI= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.0.0-20160407174126-ad28ea4487f0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.0 h1:wvCrVc9TjDls6+YGAF2hAifE1E5U1+b4tH6KdvN3Gig= +github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= -github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= -github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90 h1:VBj0QYQ0u2MCJzBfeYXGexnAl17GsH1yidnoxCqqD9E= -github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod h1:o4zcYY1e0GEZI6eSEr+43QDYmuGglw1qSO6qdHUHCgg= -github.com/hashicorp/go-sockaddr v1.0.0 h1:GeH6tui99pF4NJgfnhp+L6+FfobzVW3Ah46sLo0ICXs= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-uuid v1.0.0/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/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= 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/memberlist v0.1.0 h1:qSsCiC0WYD39lbSitKNt40e30uorm2Ss/d4JGU1hzH8= -github.com/hashicorp/memberlist v0.1.0/go.mod h1:ncdBp14cuox2iFOq3kDiquKU6fqsTBc3W6JvZwjxxsE= -github.com/hashicorp/serf v0.8.1-0.20161007004122-1d4fa605f6ff h1:epPiU3hEuHbpThFTQSGbdBBJemXM7aNQIU1thmpucTU= -github.com/hashicorp/serf v0.8.1-0.20161007004122-1d4fa605f6ff/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/nomad/api v0.0.0-20221214074818-7dbbf6bc584d h1:kEWrUx7mld3c6HRcO2KhfD1MYBkofuZfEfDwCRQ9aMU= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hetznercloud/hcloud-go v1.38.0 h1:K6Pd/mMdcLfBhvwG39qyAaacp4pCS3dKa8gChmLKxLg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/influxdata/influxdb v1.2.3-0.20170331210902-15e594fc09f1/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/ionos-cloud/sdk-go/v6 v6.1.3 h1:vb6yqdpiqaytvreM0bsn2pXw+1YDvEk2RKSmBAQvgDQ= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jmoiron/sqlx v1.3.4 h1:wv+0IJZfL5z0uZoUjlpKgHkgaFSYD+r9CfrXjEXsO7w= github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.1.1-0.20150905172533-109e267447e9/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.15.13 h1:NFn1Wr8cfnenSJSA46lLq4wHCcBzKTSjnBIexDMMOV0= +github.com/klauspost/compress v1.15.13/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00= 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.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -353,70 +374,61 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E= -github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/linode/linodego v1.9.3 h1:+lxNZw4avRxhCqGjwfPgQ2PvMT+vOL0OMsTdzixR7hQ= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU= github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU= -github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v0.0.0-20150406173934-fc2b8d3a73c4/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/miekg/dns v1.0.4 h1:Ec3LTJwwzqT1++63P12fhtdEbQhtPE7TBdD6rlhqrMM= -github.com/miekg/dns v1.0.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/minio-go/v6 v6.0.57 h1:ixPkbKkyD7IhnluRgQpGSpHdpvNVaW6OD5R9IAO/9Tw= github.com/minio/minio-go/v6 v6.0.57/go.mod h1:5+R/nM9Pwrh0vqF+HbYYDQ84wdUFPyXHkrdT4AIkifM= github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= -github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9/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-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= -github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 h1:F9x/1yl3T2AeKLr2AMdilSD8+f9bvMnNN8VS5iDtovc= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/oklog/oklog v0.2.3-0.20170918173356-f857583a70c3/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/oklog v0.3.2 h1:wVfs8F+in6nTBMkA7CbRw+zZMIB7nNM825cM1wuzoTk= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= -github.com/oklog/ulid v0.3.1-0.20170117200651-66bb6560562f h1:tt7Qj+4Pic1KiUqT7XNMnbAE3TLJAGH+5LMuX4roYbE= -github.com/oklog/ulid v0.3.1-0.20170117200651-66bb6560562f/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/opentracing-contrib/go-stdlib v0.0.0-20170113013457-1de4cc2120e7/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= -github.com/opentracing/opentracing-go v1.0.1/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= +github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/ovh/go-ovh v1.3.0 h1:mvZaddk4E4kLcXhzb+cxBsMPYp2pHqiQpWYkInsuZPQ= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/paulmach/orb v0.4.0 h1:ilp1MQjRapLJ1+qcays1nZpe0mvkCY+b8JU/qBKRZ1A= -github.com/paulmach/orb v0.4.0/go.mod h1:FkcWtplUAIVqAuhAOV2d3rpbnQyliDOjOcLW9dUrfdU= -github.com/paulmach/protoscan v0.2.1-0.20210522164731-4e53c6875432/go.mod h1:2sV+uZ/oQh66m4XJVZm5iqUZ62BN88Ex1E+TTS0nLzI= -github.com/peterbourgon/diskv v2.0.2-0.20180312054125-0646ccaebea1+incompatible h1:FhnA4iH8T/yYW+AolPONZjGE897wxj3MAzfEbrZkSYw= -github.com/peterbourgon/diskv v2.0.2-0.20180312054125-0646ccaebea1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= -github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/paulmach/orb v0.8.0 h1:W5XAt5yNPNnhaMNEf0xNSkBMJ1LzOzdk2MRlB6EN0Vs= +github.com/paulmach/orb v0.8.0/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhmqB/A= +github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= +github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= +github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/pkg/errors v0.8.1-0.20161029093637-248dadf4e906/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -424,75 +436,95 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posthog/posthog-go v0.0.0-20220817142604-0b0bbf0f9c0f h1:h0p1aZ9F5d6IXOygysob3g4B07b+HuVUQC0VJKD8wA4= github.com/posthog/posthog-go v0.0.0-20220817142604-0b0bbf0f9c0f/go.mod h1:oa2sAs9tGai3VldabTV0eWejt/O4/OOD7azP8GaikqU= -github.com/prometheus/client_golang v0.9.0-pre1.0.20181001174001-0a8115f42e03 h1:hqNopISksxji/N5zEy1xMN7TrnSyVG/LymiwnkXi6/Q= -github.com/prometheus/client_golang v0.9.0-pre1.0.20181001174001-0a8115f42e03/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 h1:osmNoEW2SCW3L7EX0km2LYM8HKpNWRiouxjE3XHkyGc= -github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= +github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= +github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/tsdb v0.0.0-20181003080831-0ce41118ed20 h1:Jh/eKJuru9z9u3rUGdQ8gYc3aZmCGkjXT3gmy0Ex8W8= -github.com/prometheus/tsdb v0.0.0-20181003080831-0ce41118ed20/go.mod h1:lFf/o1J2a31WmWQbxYXfY1azJK5Xp5D8hwKMnVMBTGU= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russellhaering/gosaml2 v0.8.0 h1:rm1Gc09/UoEsKGTSFvg8VCHJLY3wrP4BWjC+1ov0qCo= github.com/russellhaering/gosaml2 v0.8.0/go.mod h1:byViER/1YPUa0Puj9ROZblpoq2jsE7h/CJmitzX0geU= github.com/russellhaering/goxmldsig v1.2.0 h1:Y6GTTc9Un5hCxSzVz4UIWQ/zuVwDvzJk80guqzwx6Vg= github.com/russellhaering/goxmldsig v1.2.0/go.mod h1:gM4MDENBQf7M+V824SGfyIUVFWydB7n0KkEubVJl+Tw= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/samuel/go-zookeeper v0.0.0-20161028232340-1d7be4effb13/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.10 h1:wsfMs0iv+MJiViM37qh5VEKISi3/ZUq2nNKNdqmumAs= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= +github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/segmentio/backo-go v1.0.0 h1:kbOAtGJY2DqOR0jfRkYEorx/b18RgtepGtY3+Cpe6qA= github.com/segmentio/backo-go v1.0.0/go.mod h1:kJ9mm9YmoWSkk+oQ+5Cj8DEoRCX2JT6As4kEtIIOp1M= github.com/sethvargo/go-password v0.2.0 h1:BTDl4CC/gjf/axHMaDQtw507ogrXLci6XRiLc7i/UHI= github.com/sethvargo/go-password v0.2.0/go.mod h1:Ym4Mr9JXLBycr02MFuVQ/0JHidNetSgbzutTr3zsYXE= -github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20180711163814-62bca832be04/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.1.0 h1:MkTeG1DMwsrdH7QtLXy5W+fUxWq+vmb6cLmyJ7aRtF0= github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g= github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -500,35 +532,41 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= -go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 h1:yt2NKzK7Vyo6h0+X8BA4FpreZQTlVEIarnsBP/H5mzs= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0/go.mod h1:+ARmXlUlc51J7sZeCBkBJNdHGySrdOzgzxp6VWRWM1U= +go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= +go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= +go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8= +go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= +go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= +go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= -go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/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= golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/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/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -539,6 +577,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 h1:OvjRkcNHnf6/W5FZXSxODbxwD+X7fspczG7Jn/xQVD4= +golang.org/x/exp v0.0.0-20221212164502-fae10dda9338/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= 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-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -564,10 +604,12 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= 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-20181114220301-adae6a3d119a/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= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -576,6 +618,7 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -596,12 +639,14 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -609,8 +654,11 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= 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/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -631,8 +679,9 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= -golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8= golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8= +golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -644,9 +693,13 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20181116152217-5ac8a444bdc5/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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -657,11 +710,9 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -674,6 +725,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -681,6 +734,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -689,6 +743,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -696,7 +751,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -709,11 +763,16 @@ golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -722,14 +781,15 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -737,7 +797,6 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 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-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= 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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -747,8 +806,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/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-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -786,17 +843,16 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/api v0.0.0-20180506000402-20530fd5d65a/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= 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= @@ -835,7 +891,6 @@ google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRR google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= -google.golang.org/api v0.84.0 h1:NMB9J4cCxs9xEm+1Z9QiO3eFvn7EnQj3Eo3hN6ugVlg= google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -845,7 +900,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/cloud v0.0.0-20160622021550-0a83eba2cadb/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -875,7 +929,6 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -924,8 +977,8 @@ google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 h1:4SPz2GL2CXJt28MTF8V6Ap/9ZiVbQlJeGSd9qtA7DLs= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 h1:jmIfw8+gSvXcZSgaFAGyInDXeWzUhvYH57G/5GKMn70= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -956,11 +1009,10 @@ google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/grpc/examples v0.0.0-20210803221256-6ba56c814be7 h1:k3XsiLoPLXhNlZJy1sHKvkgGEfpMk8bsdJVHKKhTdrc= -google.golang.org/grpc/examples v0.0.0-20210803221256-6ba56c814be7/go.mod h1:bF8wuZSAZTcbF7ZPKrDI/qY52toTP/yxLpRRY4Eu9Js= 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= @@ -974,49 +1026,56 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.5/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify/fsnotify.v1 v1.3.0/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= 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.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/segmentio/analytics-go.v3 v3.1.0 h1:UzxH1uaGZRpMKDhJyBz0pexz6yUoBU3x8bJsRk/HV6U= gopkg.in/segmentio/analytics-go.v3 v3.1.0/go.mod h1:4QqqlTlSSpVlWA9/9nDcPw+FkM2yv1NQoYjUbL9/JAw= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +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.3/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.5/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/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 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.0.0-20180628040859-072894a440bd h1:HzgYeLDS1jLxw8DGr68KJh9cdQ5iZJizG0HZWstIhfQ= -k8s.io/api v0.0.0-20180628040859-072894a440bd/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d h1:MZjlsu9igBoVPZkXpIGoxI6EonqNsXXZU7hhvfQLkd4= -k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/client-go v8.0.0+incompatible h1:tTI4hRmb1DRMl4fG6Vclfdi6nTM82oIrTT7HfitmxC4= -k8s.io/client-go v8.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/kube-openapi v0.0.0-20180629012420-d83b052f768a h1:tHgpQvrWaYfrnC8G4N0Oszw5HHCsZxKilDi2R7HuCSM= -k8s.io/kube-openapi v0.0.0-20180629012420-d83b052f768a/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I= +k8s.io/apimachinery v0.26.0 h1:1feANjElT7MvPqp0JT6F3Ss6TWDwmcjLypwoPpEf7zg= +k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= +k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 h1:tBEbstoM+K0FiBV5KGAKQ0kuvf54v/hwpldiJt69w1s= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff --git a/pkg/query-service/Dockerfile b/pkg/query-service/Dockerfile index 0f70af1ea5..2d05e02133 100644 --- a/pkg/query-service/Dockerfile +++ b/pkg/query-service/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17-buster AS builder +FROM golang:1.18-buster AS builder # LD_FLAGS is passed as argument from Makefile. It will be empty, if no argument passed ARG LD_FLAGS diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go index 4fc644bc8b..cf66408d8a 100644 --- a/pkg/query-service/app/clickhouseReader/reader.go +++ b/pkg/query-service/app/clickhouseReader/reader.go @@ -27,7 +27,7 @@ import ( "github.com/prometheus/common/promlog" "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" - sd_config "github.com/prometheus/prometheus/discovery/config" + sd_config "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/scrape" @@ -158,21 +158,28 @@ func NewReader(localDB *sqlx.DB, configFile string, featureFlag interfaces.Featu func (r *ClickHouseReader) Start(readerReady chan bool) { logLevel := promlog.AllowedLevel{} logLevel.Set("debug") - // allowedFormat := promlog.AllowedFormat{} - // allowedFormat.Set("logfmt") + allowedFormat := promlog.AllowedFormat{} + allowedFormat.Set("logfmt") - // promlogConfig := promlog.Config{ - // Level: &logLevel, - // Format: &allowedFormat, - // } + promlogConfig := promlog.Config{ + Level: &logLevel, + Format: &allowedFormat, + } - logger := promlog.New(logLevel) + logger := promlog.New(&promlogConfig) startTime := func() (int64, error) { return int64(promModel.Latest), nil } - remoteStorage := remote.NewStorage(log.With(logger, "component", "remote"), startTime, time.Duration(1*time.Minute)) + remoteStorage := remote.NewStorage( + log.With(logger, "component", "remote"), + nil, + startTime, + "", + time.Duration(1*time.Minute), + nil, + ) cfg := struct { configFile string @@ -198,14 +205,18 @@ func (r *ClickHouseReader) Start(readerReady chan bool) { ctxScrape, cancelScrape := context.WithCancel(context.Background()) discoveryManagerScrape := discovery.NewManager(ctxScrape, log.With(logger, "component", "discovery manager scrape"), discovery.Name("scrape")) - scrapeManager := scrape.NewManager(log.With(logger, "component", "scrape manager"), fanoutStorage) + scrapeManager := scrape.NewManager(nil, log.With(logger, "component", "scrape manager"), fanoutStorage) opts := promql.EngineOpts{ - Logger: log.With(logger, "component", "query engine"), - Reg: nil, - MaxConcurrent: 20, - MaxSamples: 50000000, - Timeout: time.Duration(2 * time.Minute), + Logger: log.With(logger, "component", "query engine"), + Reg: nil, + MaxSamples: 50000000, + Timeout: time.Duration(2 * time.Minute), + ActiveQueryTracker: promql.NewActiveQueryTracker( + "", + 20, + log.With(logger, "component", "activeQueryTracker"), + ), } queryEngine := promql.NewEngine(opts) @@ -216,9 +227,9 @@ func (r *ClickHouseReader) Start(readerReady chan bool) { // they need to read the most updated config when receiving the new targets list. scrapeManager.ApplyConfig, func(cfg *config.Config) error { - c := make(map[string]sd_config.ServiceDiscoveryConfig) + c := make(map[string]sd_config.Configs) for _, v := range cfg.ScrapeConfigs { - c[v.JobName] = v.ServiceDiscoveryConfig + c[v.JobName] = v.ServiceDiscoveryConfigs } return discoveryManagerScrape.ApplyConfig(c) }, @@ -344,7 +355,7 @@ func (r *ClickHouseReader) GetFanoutStorage() *storage.Storage { func reloadConfig(filename string, logger log.Logger, rls ...func(*config.Config) error) (promConfig *config.Config, err error) { level.Info(logger).Log("msg", "Loading configuration file", "filename", filename) - conf, err := config.LoadFile(filename) + conf, err := config.LoadFile(filename, false, false, logger) if err != nil { return nil, fmt.Errorf("couldn't load configuration (--config.file=%q): %v", filename, err) } @@ -635,7 +646,7 @@ func (r *ClickHouseReader) CreateChannel(receiver *am.Receiver) (*am.Receiver, * } func (r *ClickHouseReader) GetInstantQueryMetricsResult(ctx context.Context, queryParams *model.InstantQueryMetricsParams) (*promql.Result, *stats.QueryStats, *model.ApiError) { - qry, err := r.queryEngine.NewInstantQuery(r.remoteStorage, queryParams.Query, queryParams.Time) + qry, err := r.queryEngine.NewInstantQuery(r.remoteStorage, &promql.QueryOpts{}, queryParams.Query, queryParams.Time) if err != nil { return nil, nil, &model.ApiError{Typ: model.ErrorBadData, Err: err} } @@ -643,19 +654,18 @@ func (r *ClickHouseReader) GetInstantQueryMetricsResult(ctx context.Context, que res := qry.Exec(ctx) // Optional stats field in response if parameter "stats" is not empty. - var qs *stats.QueryStats + var qs stats.QueryStats if queryParams.Stats != "" { qs = stats.NewQueryStats(qry.Stats()) } qry.Close() - return res, qs, nil + return res, &qs, nil } func (r *ClickHouseReader) GetQueryRangeResult(ctx context.Context, query *model.QueryRangeParams) (*promql.Result, *stats.QueryStats, *model.ApiError) { - - qry, err := r.queryEngine.NewRangeQuery(r.remoteStorage, query.Query, query.Start, query.End, query.Step) + qry, err := r.queryEngine.NewRangeQuery(r.remoteStorage, &promql.QueryOpts{}, query.Query, query.Start, query.End, query.Step) if err != nil { return nil, nil, &model.ApiError{Typ: model.ErrorBadData, Err: err} @@ -664,13 +674,13 @@ func (r *ClickHouseReader) GetQueryRangeResult(ctx context.Context, query *model res := qry.Exec(ctx) // Optional stats field in response if parameter "stats" is not empty. - var qs *stats.QueryStats + var qs stats.QueryStats if query.Stats != "" { qs = stats.NewQueryStats(qry.Stats()) } qry.Close() - return res, qs, nil + return res, &qs, nil } func (r *ClickHouseReader) GetServicesList(ctx context.Context) (*[]string, error) { diff --git a/pkg/query-service/app/http_handler_test.go b/pkg/query-service/app/http_handler_test.go index a84014eecd..84782f7cae 100644 --- a/pkg/query-service/app/http_handler_test.go +++ b/pkg/query-service/app/http_handler_test.go @@ -67,7 +67,7 @@ func TestPrepareQuery(t *testing.T) { Query: "ALTER TABLE signoz_table DELETE where true", }, expectedErr: true, - errMsg: "query shouldn't alter data", + errMsg: "Operation alter table is not allowed", }, { name: "query text produces template exec error", diff --git a/pkg/query-service/model/response.go b/pkg/query-service/model/response.go index 716f09f91b..d6a0570234 100644 --- a/pkg/query-service/model/response.go +++ b/pkg/query-service/model/response.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/prometheus/prometheus/promql" + "github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/util/stats" "k8s.io/apimachinery/pkg/labels" ) @@ -90,13 +90,13 @@ func InternalError(err error) *ApiError { } type QueryDataV2 struct { - ResultType promql.ValueType `json:"resultType"` - Result promql.Value `json:"result"` + ResultType parser.ValueType `json:"resultType"` + Result parser.Value `json:"result"` } type QueryData struct { - ResultType promql.ValueType `json:"resultType"` - Result promql.Value `json:"result"` + ResultType parser.ValueType `json:"resultType"` + Result parser.Value `json:"result"` Stats *stats.QueryStats `json:"stats,omitempty"` } diff --git a/pkg/query-service/pqlEngine/engine.go b/pkg/query-service/pqlEngine/engine.go index 659683986d..156e33bd07 100644 --- a/pkg/query-service/pqlEngine/engine.go +++ b/pkg/query-service/pqlEngine/engine.go @@ -7,9 +7,11 @@ import ( "github.com/go-kit/log" pmodel "github.com/prometheus/common/model" + "github.com/prometheus/common/promlog" plog "github.com/prometheus/common/promlog" pconfig "github.com/prometheus/prometheus/config" - plabels "github.com/prometheus/prometheus/pkg/labels" + plabels "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/promql" pql "github.com/prometheus/prometheus/promql" pstorage "github.com/prometheus/prometheus/storage" premote "github.com/prometheus/prometheus/storage/remote" @@ -23,7 +25,7 @@ type PqlEngine struct { func FromConfigPath(promConfigPath string) (*PqlEngine, error) { // load storage path - c, err := pconfig.LoadFile(promConfigPath) + c, err := pconfig.LoadFile(promConfigPath, false, false, nil) if err != nil { return nil, fmt.Errorf("couldn't load configuration (--config.file=%q): %v", promConfigPath, err) } @@ -42,14 +44,27 @@ func NewPqlEngine(config *pconfig.Config) (*PqlEngine, error) { logLevel := plog.AllowedLevel{} logLevel.Set("debug") - logger := plog.New(logLevel) + + allowedFormat := promlog.AllowedFormat{} + allowedFormat.Set("logfmt") + + promlogConfig := promlog.Config{ + Level: &logLevel, + Format: &allowedFormat, + } + + logger := plog.New(&promlogConfig) opts := pql.EngineOpts{ - Logger: log.With(logger, "component", "promql evaluator"), - Reg: nil, - MaxConcurrent: 20, - MaxSamples: 50000000, - Timeout: time.Duration(2 * time.Minute), + Logger: log.With(logger, "component", "promql evaluator"), + Reg: nil, + MaxSamples: 50000000, + Timeout: time.Duration(2 * time.Minute), + ActiveQueryTracker: pql.NewActiveQueryTracker( + "", + 20, + logger, + ), } e := pql.NewEngine(opts) @@ -57,7 +72,14 @@ func NewPqlEngine(config *pconfig.Config) (*PqlEngine, error) { return int64(pmodel.Latest), nil } - remoteStorage := premote.NewStorage(log.With(logger, "component", "remote"), startTime, time.Duration(1*time.Minute)) + remoteStorage := premote.NewStorage( + log.With(logger, "component", "remote"), + nil, + startTime, + "", + time.Duration(1*time.Minute), + nil, + ) fanoutStorage := pstorage.NewFanout(logger, remoteStorage) remoteStorage.ApplyConfig(config) @@ -69,7 +91,7 @@ func NewPqlEngine(config *pconfig.Config) (*PqlEngine, error) { } func (p *PqlEngine) RunAlertQuery(ctx context.Context, qs string, t time.Time) (pql.Vector, error) { - q, err := p.engine.NewInstantQuery(p.fanoutStorage, qs, t) + q, err := p.engine.NewInstantQuery(p.fanoutStorage, &promql.QueryOpts{}, qs, t) if err != nil { return nil, err } @@ -85,7 +107,7 @@ func (p *PqlEngine) RunAlertQuery(ctx context.Context, qs string, t time.Time) ( return v, nil case pql.Scalar: return pql.Vector{pql.Sample{ - Point: pql.Point(v), + Point: pql.Point{T: v.T, V: v.V, H: nil}, Metric: plabels.Labels{}, }}, nil default: diff --git a/pkg/query-service/rules/promRule.go b/pkg/query-service/rules/promRule.go index bd4ff4d134..f29a8311fc 100644 --- a/pkg/query-service/rules/promRule.go +++ b/pkg/query-service/rules/promRule.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/log/level" "go.uber.org/zap" - plabels "github.com/prometheus/prometheus/pkg/labels" + plabels "github.com/prometheus/prometheus/model/labels" pql "github.com/prometheus/prometheus/promql" "go.signoz.io/signoz/pkg/query-service/model" qslabels "go.signoz.io/signoz/pkg/query-service/utils/labels" @@ -190,7 +190,7 @@ func (r *PromRule) sample(alert *Alert, ts time.Time) pql.Sample { lb.Set(qslabels.AlertStateLabel, alert.State.String()) s := pql.Sample{ - Metric: lb.Labels(), + Metric: lb.Labels(nil), Point: pql.Point{T: timestamp.FromTime(ts), V: 1}, } return s @@ -373,7 +373,7 @@ func (r *PromRule) Eval(ctx context.Context, ts time.Time, queriers *Queriers) ( annotations = append(annotations, plabels.Label{Name: a.Name, Value: expand(a.Value)}) } - lbs := lb.Labels() + lbs := lb.Labels(nil) h := lbs.Hash() resultFPs[h] = struct{}{} diff --git a/pkg/query-service/rules/promRuleTask.go b/pkg/query-service/rules/promRuleTask.go index fa84d80d57..d4a853d844 100644 --- a/pkg/query-service/rules/promRuleTask.go +++ b/pkg/query-service/rules/promRuleTask.go @@ -3,13 +3,14 @@ package rules import ( "context" "fmt" - "github.com/go-kit/log" - opentracing "github.com/opentracing/opentracing-go" - plabels "github.com/prometheus/prometheus/pkg/labels" - "go.uber.org/zap" "sort" "sync" "time" + + "github.com/go-kit/log" + opentracing "github.com/opentracing/opentracing-go" + plabels "github.com/prometheus/prometheus/model/labels" + "go.uber.org/zap" ) // PromRuleTask is a promql rule executor diff --git a/pkg/query-service/utils/labels/interface.go b/pkg/query-service/utils/labels/interface.go index d4ae4700a1..85bd06f29c 100644 --- a/pkg/query-service/utils/labels/interface.go +++ b/pkg/query-service/utils/labels/interface.go @@ -6,7 +6,7 @@ type BaseLabels interface { Less(i, j int) bool String() string Hash() uint64 - HashForLabels(names ...string) uint64 + HashForLabels(b []byte, names ...string) (uint64, []byte) Get(name string) string Has(name string) bool Map() map[string]string diff --git a/pkg/query-service/utils/labels/labels.go b/pkg/query-service/utils/labels/labels.go index b7f6fdc09d..ff4237a8f9 100644 --- a/pkg/query-service/utils/labels/labels.go +++ b/pkg/query-service/utils/labels/labels.go @@ -92,21 +92,25 @@ func (ls Labels) Hash() uint64 { } // HashForLabels returns a hash value for the labels matching the provided names. -func (ls Labels) HashForLabels(names ...string) uint64 { - b := make([]byte, 0, 1024) - - for _, v := range ls { - for _, n := range names { - if v.Name == n { - b = append(b, v.Name...) - b = append(b, sep) - b = append(b, v.Value...) - b = append(b, sep) - break - } +func (ls Labels) HashForLabels(b []byte, names ...string) (uint64, []byte) { + var seps = []byte{'\xff'} + b = b[:0] + i, j := 0, 0 + for i < len(ls) && j < len(names) { + if names[j] < ls[i].Name { + j++ + } else if ls[i].Name < names[j] { + i++ + } else { + b = append(b, ls[i].Name...) + b = append(b, seps[0]) + b = append(b, ls[i].Value...) + b = append(b, seps[0]) + i++ + j++ } } - return xxhash.Sum64(b) + return xxhash.Sum64(b), b } // HashWithoutLabels returns a hash value for all labels except those matching From eff87f26662f293e416dae7d6e875136c1ecf8ba Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Tue, 7 Mar 2023 11:26:56 +0200 Subject: [PATCH 20/29] feat: move form into useForm from antd (#2403) Co-authored-by: gitstart Co-authored-by: palashgdev Co-authored-by: Vishal Sharma --- frontend/src/container/Login/index.tsx | 58 ++--- frontend/src/container/Login/styles.ts | 8 +- .../src/container/ResetPassword/index.tsx | 73 +++--- .../src/container/ResetPassword/styles.ts | 8 +- frontend/src/pages/SignUp/SignUp.tsx | 244 +++++++++--------- frontend/src/pages/SignUp/styles.ts | 8 +- 6 files changed, 194 insertions(+), 205 deletions(-) diff --git a/frontend/src/container/Login/index.tsx b/frontend/src/container/Login/index.tsx index a8fda93908..cb9775fbe8 100644 --- a/frontend/src/container/Login/index.tsx +++ b/frontend/src/container/Login/index.tsx @@ -1,4 +1,4 @@ -import { Button, Input, Space, Tooltip, Typography } from 'antd'; +import { Button, Form, Input, Space, Tooltip, Typography } from 'antd'; import getUserVersion from 'api/user/getVersion'; import loginApi from 'api/user/login'; import loginPrecheckApi from 'api/user/loginPrecheck'; @@ -23,6 +23,8 @@ interface LoginProps { withPassword: string; } +type FormValues = { email: string; password: string }; + function Login({ jwt, refreshjwt, @@ -32,8 +34,6 @@ function Login({ }: LoginProps): JSX.Element { const { t } = useTranslation(['login']); const [isLoading, setIsLoading] = useState(false); - const [email, setEmail] = useState(''); - const [password, setPassword] = useState(''); const [precheckResult, setPrecheckResult] = useState({ sso: false, @@ -67,6 +67,8 @@ function Login({ } }, [getUserVersionResponse]); + const [form] = Form.useForm(); + useEffect(() => { if (withPassword === 'Y') { setPrecheckComplete(true); @@ -94,6 +96,7 @@ function Login({ }, [ssoerror, t, notifications]); const onNextHandler = async (): Promise => { + const email = form.getFieldValue('email'); if (!email) { notifications.error({ message: t('invalid_email'), @@ -129,22 +132,11 @@ function Login({ setPrecheckInProcess(false); }; - const onChangeHandler = ( - setFunc: React.Dispatch>, - value: string, - ): void => { - setFunc(value); - }; - const { sso, canSelfRegister } = precheckResult; - const onSubmitHandler: React.FormEventHandler = async ( - event, - ) => { + const onSubmitHandler: () => Promise = async () => { try { - event.preventDefault(); - event.persist(); - + const { email, password } = form.getFieldsValue(); if (!precheckComplete) { onNextHandler(); return; @@ -208,33 +200,27 @@ function Login({ return ( - + {t('login_page_title')} - onChangeHandler(setEmail, event.target.value)} - value={email} - disabled={isLoading} - /> + + + {precheckComplete && !sso && ( - - onChangeHandler(setPassword, event.target.value) - } - disabled={isLoading} - value={password} - /> + + + {t('forgot_password')} diff --git a/frontend/src/container/Login/styles.ts b/frontend/src/container/Login/styles.ts index cfead5fc06..562cd1a7ec 100644 --- a/frontend/src/container/Login/styles.ts +++ b/frontend/src/container/Login/styles.ts @@ -1,4 +1,4 @@ -import { Card } from 'antd'; +import { Card, Form } from 'antd'; import styled from 'styled-components'; export const FormWrapper = styled(Card)` @@ -22,11 +22,15 @@ export const Label = styled.label` line-height: 24px; `; -export const FormContainer = styled.form` +export const FormContainer = styled(Form)` display: flex; flex-direction: column; align-items: flex-start; width: 100%; + + & .ant-form-item { + margin-bottom: 0px; + } `; export const ParentContainer = styled.div` diff --git a/frontend/src/container/ResetPassword/index.tsx b/frontend/src/container/ResetPassword/index.tsx index 5245676866..69e0b7b047 100644 --- a/frontend/src/container/ResetPassword/index.tsx +++ b/frontend/src/container/ResetPassword/index.tsx @@ -1,4 +1,4 @@ -import { Button, Input, Typography } from 'antd'; +import { Button, Form, Input, Typography } from 'antd'; import resetPasswordApi from 'api/user/resetPassword'; import { Logout } from 'api/utils'; import WelcomeLeftContainer from 'components/WelcomeLeftContainer'; @@ -10,13 +10,13 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation } from 'react-use'; -import { ButtonContainer, FormWrapper } from './styles'; +import { ButtonContainer, FormContainer, FormWrapper } from './styles'; const { Title } = Typography; +type FormValues = { password: string; confirmPassword: string }; + function ResetPassword({ version }: ResetPasswordProps): JSX.Element { - const [password, setPassword] = useState(''); - const [confirmPassword, setConfirmPassword] = useState(''); const [confirmPasswordError, setConfirmPasswordError] = useState( false, ); @@ -27,6 +27,7 @@ function ResetPassword({ version }: ResetPasswordProps): JSX.Element { const token = params.get('token'); const { notifications } = useNotifications(); + const [form] = Form.useForm(); useEffect(() => { if (!token) { Logout(); @@ -34,20 +35,10 @@ function ResetPassword({ version }: ResetPasswordProps): JSX.Element { } }, [token]); - const setState = ( - value: string, - setFunction: React.Dispatch>, - ): void => { - setFunction(value); - }; - - const handleSubmit: React.FormEventHandler = async ( - event, - ): Promise => { + const handleSubmit: () => Promise = async () => { try { setLoading(true); - event.preventDefault(); - event.persist(); + const { password } = form.getFieldsValue(); const response = await resetPasswordApi({ password, @@ -81,40 +72,38 @@ function ResetPassword({ version }: ResetPasswordProps): JSX.Element { }); } }; + const handleValuesChange: (changedValues: FormValues) => void = ( + changedValues, + ) => { + if ('confirmPassword' in changedValues) { + const { confirmPassword } = changedValues; + + const isSamePassword = form.getFieldValue('password') === confirmPassword; + setConfirmPasswordError(!isSamePassword); + } + }; return ( -
+ Reset Your Password
- { - setState(e.target.value, setPassword); - }} - required - id="currentPassword" - /> + + +
- { - const updateValue = e.target.value; - setState(updateValue, setConfirmPassword); - if (password !== updateValue) { - setConfirmPasswordError(true); - } else { - setConfirmPasswordError(false); - } - }} - required - id="UpdatePassword" - /> + + + {confirmPasswordError && ( - + ); diff --git a/frontend/src/container/ResetPassword/styles.ts b/frontend/src/container/ResetPassword/styles.ts index 8405f31669..e59a453695 100644 --- a/frontend/src/container/ResetPassword/styles.ts +++ b/frontend/src/container/ResetPassword/styles.ts @@ -1,4 +1,4 @@ -import { Card } from 'antd'; +import { Card, Form } from 'antd'; import styled from 'styled-components'; export const FormWrapper = styled(Card)` @@ -14,3 +14,9 @@ export const ButtonContainer = styled.div` justify-content: center; align-items: center; `; + +export const FormContainer = styled(Form)` + & .ant-form-item { + margin-bottom: 0px; + } +`; diff --git a/frontend/src/pages/SignUp/SignUp.tsx b/frontend/src/pages/SignUp/SignUp.tsx index 53174a3610..a8c1c1687c 100644 --- a/frontend/src/pages/SignUp/SignUp.tsx +++ b/frontend/src/pages/SignUp/SignUp.tsx @@ -1,4 +1,4 @@ -import { Button, Input, Space, Switch, Typography } from 'antd'; +import { Button, Form, Input, Space, Switch, Typography } from 'antd'; import editOrg from 'api/user/editOrg'; import getInviteDetails from 'api/user/getInviteDetails'; import loginApi from 'api/user/login'; @@ -16,11 +16,27 @@ import { SuccessResponse } from 'types/api'; import { PayloadProps } from 'types/api/user/getUser'; import * as loginPrecheck from 'types/api/user/loginPrecheck'; -import { ButtonContainer, FormWrapper, Label, MarginTop } from './styles'; +import { + ButtonContainer, + FormContainer, + FormWrapper, + Label, + MarginTop, +} from './styles'; import { isPasswordNotValidMessage, isPasswordValid } from './utils'; const { Title } = Typography; +type FormValues = { + firstName: string; + email: string; + organizationName: string; + password: string; + confirmPassword: string; + hasOptedUpdates: boolean; + isAnonymous: boolean; +}; + function SignUp({ version }: SignUpProps): JSX.Element { const { t } = useTranslation(['signup']); const [loading, setLoading] = useState(false); @@ -30,13 +46,6 @@ function SignUp({ version }: SignUpProps): JSX.Element { isUser: false, }); - const [firstName, setFirstName] = useState(''); - const [email, setEmail] = useState(''); - const [organizationName, setOrganizationName] = useState(''); - const [hasOptedUpdates, setHasOptedUpdates] = useState(true); - const [isAnonymous, setIsAnonymous] = useState(false); - const [password, setPassword] = useState(''); - const [confirmPassword, setConfirmPassword] = useState(''); const [confirmPasswordError, setConfirmPasswordError] = useState( false, ); @@ -58,6 +67,7 @@ function SignUp({ version }: SignUpProps): JSX.Element { }); const { notifications } = useNotifications(); + const [form] = Form.useForm(); useEffect(() => { if ( @@ -66,9 +76,9 @@ function SignUp({ version }: SignUpProps): JSX.Element { ) { const responseDetails = getInviteDetailsResponse.data.payload; if (responseDetails.precheck) setPrecheck(responseDetails.precheck); - setFirstName(responseDetails.name); - setEmail(responseDetails.email); - setOrganizationName(responseDetails.organization); + form.setFieldValue('firstName', responseDetails.name); + form.setFieldValue('email', responseDetails.email); + form.setFieldValue('organizationName', responseDetails.organization); setIsDetailsDisable(true); } if ( @@ -86,21 +96,17 @@ function SignUp({ version }: SignUpProps): JSX.Element { getInviteDetailsResponse.status, getInviteDetailsResponse, notifications, + form, ]); - const setState = ( - value: string, - setFunction: React.Dispatch>, - ): void => { - setFunction(value); - }; - const isPreferenceVisible = token === null; const commonHandler = async ( + values: FormValues, callback: (e: SuccessResponse) => Promise | VoidFunction, ): Promise => { try { + const { organizationName, password, firstName, email } = values; const response = await signUpApi({ email, name: firstName, @@ -145,6 +151,11 @@ function SignUp({ version }: SignUpProps): JSX.Element { const onAdminAfterLogin = async ( userResponse: SuccessResponse, ): Promise => { + const { + organizationName, + isAnonymous, + hasOptedUpdates, + } = form.getFieldsValue(); const editResponse = await editOrg({ isAnonymous, name: organizationName, @@ -159,9 +170,7 @@ function SignUp({ version }: SignUpProps): JSX.Element { }); } }; - const handleSubmitSSO = async ( - e: React.FormEvent, - ): Promise => { + const handleSubmitSSO = async (): Promise => { if (!params.get('token')) { notifications.error({ message: t('token_required'), @@ -171,12 +180,12 @@ function SignUp({ version }: SignUpProps): JSX.Element { setLoading(true); try { - e.preventDefault(); + const values = form.getFieldsValue(); const response = await signUpApi({ - email, - name: firstName, - orgName: organizationName, - password, + email: values.email, + name: values.firstName, + orgName: values.organizationName, + password: values.password, token: params.get('token') || undefined, sourceUrl: encodeURIComponent(window.location.href), }); @@ -207,22 +216,23 @@ function SignUp({ version }: SignUpProps): JSX.Element { setLoading(false); }; - const handleSubmit = (e: React.FormEvent): void => { + const handleSubmit = (): void => { (async (): Promise => { try { - e.preventDefault(); + const values = form.getFieldsValue(); setLoading(true); - if (!isPasswordValid(password)) { + if (!isPasswordValid(values.password)) { setIsPasswordPolicyError(true); setLoading(false); return; } if (isPreferenceVisible) { - await commonHandler(onAdminAfterLogin); + await commonHandler(values, onAdminAfterLogin); } else { await commonHandler( + values, async (): Promise => { history.push(ROUTES.APPLICATION); }, @@ -239,108 +249,101 @@ function SignUp({ version }: SignUpProps): JSX.Element { })(); }; - const onSwitchHandler = ( - value: boolean, - setFunction: React.Dispatch>, - ): void => { - setFunction(value); - }; - const getIsNameVisible = (): boolean => - !(firstName.length === 0 && !isPreferenceVisible); + !(form.getFieldValue('firstName') === 0 && !isPreferenceVisible); const isNameVisible = getIsNameVisible(); - useEffect(() => { - if (!isPasswordValid(password) && password.length) { - setIsPasswordPolicyError(true); - } else { - setIsPasswordPolicyError(false); - } + const handleValuesChange: (changedValues: Partial) => void = ( + changedValues, + ) => { + if ('password' in changedValues || 'confirmPassword' in changedValues) { + const { password, confirmPassword } = form.getFieldsValue(); - if (password !== confirmPassword) { - setConfirmPasswordError(true); - } else { - setConfirmPasswordError(false); + const isInvalidPassword = !isPasswordValid(password) && password.length > 0; + setIsPasswordPolicyError(isInvalidPassword); + + const isSamePassword = password === confirmPassword; + setConfirmPasswordError(!isSamePassword); } - }, [password, confirmPassword]); + }; + + const isValidForm: () => boolean = () => { + const values = form.getFieldsValue(); + return ( + loading || + !values.email || + !values.organizationName || + (!precheck.sso && (!values.password || !values.confirmPassword)) || + (!isDetailsDisable && !values.firstName) || + confirmPasswordError || + isPasswordPolicyError + ); + }; return ( -
+ Create your account
- { - setState(e.target.value, setEmail); - }} - required - id="signupEmail" - disabled={isDetailsDisable} - /> + + +
{isNameVisible && (
- - { - setState(e.target.value, setFirstName); - }} - required - id="signupFirstName" - disabled={isDetailsDisable} - /> + {' '} + + +
)}
- - { - setState(e.target.value, setOrganizationName); - }} - required - id="organizationName" - disabled={isDetailsDisable} - /> + {' '} + + +
{!precheck.sso && (
- - { - setState(e.target.value, setPassword); - }} - required - id="currentPassword" - /> + {' '} + + +
)} {!precheck.sso && (
- - { - const updateValue = e.target.value; - setState(updateValue, setConfirmPassword); - }} - required - id="confirmPassword" - /> - + {' '} + + + {confirmPasswordError && ( - onSwitchHandler(value, setHasOptedUpdates)} - checked={hasOptedUpdates} - /> + + + + {t('prompt_keepme_posted')} - onSwitchHandler(value, setIsAnonymous)} - checked={isAnonymous} - /> + + + {t('prompt_anonymise')} @@ -410,20 +416,12 @@ function SignUp({ version }: SignUpProps): JSX.Element { htmlType="submit" data-attr="signup" loading={loading} - disabled={ - loading || - !email || - !organizationName || - (!precheck.sso && (!password || !confirmPassword)) || - (!isDetailsDisable && !firstName) || - confirmPasswordError || - isPasswordPolicyError - } + disabled={isValidForm()} > {t('button_get_started')} - + ); diff --git a/frontend/src/pages/SignUp/styles.ts b/frontend/src/pages/SignUp/styles.ts index 3e6064f6f7..f8224e7dbd 100644 --- a/frontend/src/pages/SignUp/styles.ts +++ b/frontend/src/pages/SignUp/styles.ts @@ -1,4 +1,4 @@ -import { Card } from 'antd'; +import { Card, Form } from 'antd'; import React from 'react'; import styled from 'styled-components'; @@ -31,3 +31,9 @@ interface Props { export const MarginTop = styled.div` margin-top: ${({ marginTop = 0 }): number | string => marginTop}; `; + +export const FormContainer = styled(Form)` + & .ant-form-item { + margin-bottom: 0px; + } +`; From c821e8bb7514f27d55c9183ecaf12f352dedb96a Mon Sep 17 00:00:00 2001 From: GitStart <1501599+gitstart@users.noreply.github.com> Date: Tue, 7 Mar 2023 12:25:59 +0100 Subject: [PATCH 21/29] feat: add ability to change panel type (#2383) * feat: add ability to change panel type * feat: add ability to change panel type --------- Co-authored-by: gitstart Co-authored-by: palashgdev --- .../NewWidget/RightContainer/index.tsx | 29 ++++++++++++------- frontend/src/container/NewWidget/index.tsx | 20 ++++++++++--- .../store/actions/dashboard/saveDashboard.ts | 6 ++-- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/frontend/src/container/NewWidget/RightContainer/index.tsx b/frontend/src/container/NewWidget/RightContainer/index.tsx index f1c9460fd0..eb80d3c62f 100644 --- a/frontend/src/container/NewWidget/RightContainer/index.tsx +++ b/frontend/src/container/NewWidget/RightContainer/index.tsx @@ -1,8 +1,10 @@ -import { Input } from 'antd'; +import { Input, Select } from 'antd'; import InputComponent from 'components/Input'; import TimePreference from 'components/TimePreferenceDropDown'; import { GRAPH_TYPES } from 'container/NewDashboard/ComponentsSlider'; -import GraphTypes from 'container/NewDashboard/ComponentsSlider/menuItems'; +import GraphTypes, { + ITEMS, +} from 'container/NewDashboard/ComponentsSlider/menuItems'; import React, { useCallback } from 'react'; import { Container, Title } from './styles'; @@ -10,6 +12,7 @@ import { timePreferance } from './timeItems'; import YAxisUnitSelector from './YAxisUnitSelector'; const { TextArea } = Input; +const { Option } = Select; function RightContainer({ description, @@ -21,6 +24,7 @@ function RightContainer({ selectedTime, yAxisUnit, setYAxisUnit, + setGraphHandler, }: RightContainerProps): JSX.Element { const onChangeHandler = useCallback( (setFunc: React.Dispatch>, value: string) => { @@ -34,14 +38,18 @@ function RightContainer({ return ( - - + Panel Type + Panel Attributes >; + setGraphHandler: (type: ITEMS) => void; } export default RightContainer; diff --git a/frontend/src/container/NewWidget/index.tsx b/frontend/src/container/NewWidget/index.tsx index 269d6e3666..c9ccd7c1f9 100644 --- a/frontend/src/container/NewWidget/index.tsx +++ b/frontend/src/container/NewWidget/index.tsx @@ -1,6 +1,7 @@ import { Button, Modal, Typography } from 'antd'; import ROUTES from 'constants/routes'; import { GRAPH_TYPES } from 'container/NewDashboard/ComponentsSlider'; +import { ITEMS } from 'container/NewDashboard/ComponentsSlider/menuItems'; import { getDashboardVariables } from 'lib/dashbaordVariables/getDashboardVariables'; import history from 'lib/history'; import { DashboardWidgetPageParams } from 'pages/DashboardWidget'; @@ -86,6 +87,7 @@ function NewWidget({ const [saveModal, setSaveModal] = useState(false); const [hasUnstagedChanges, setHasUnstagedChanges] = useState(false); + const [graphType, setGraphType] = useState(selectedGraph); const getSelectedTime = useCallback( () => TimeItems.find( @@ -112,6 +114,7 @@ function NewWidget({ yAxisUnit, widgetId: query.get('widgetId') || '', dashboardId, + graphType, }); }, [ saveSettingOfPanel, @@ -125,6 +128,7 @@ function NewWidget({ yAxisUnit, query, dashboardId, + graphType, ]); const onClickDiscardHandler = useCallback(() => { @@ -140,7 +144,7 @@ function NewWidget({ query: selectedWidget?.query, selectedTime: selectedTime.enum, widgetId: selectedWidget?.id || '', - graphType: selectedGraph, + graphType, globalSelectedInterval, variables: getDashboardVariables(), }); @@ -149,11 +153,18 @@ function NewWidget({ selectedWidget?.query, selectedTime.enum, selectedWidget?.id, - selectedGraph, getQueryResults, globalSelectedInterval, + graphType, ]); + const setGraphHandler = (type: ITEMS): void => { + const params = new URLSearchParams(search); + params.set('graphType', type); + history.push({ search: params.toString() }); + setGraphType(type); + }; + useEffect(() => { getQueryResult(); }, [getQueryResult]); @@ -173,13 +184,14 @@ function NewWidget({ ) => void) => // eslint-disable-next-line sonarjs/cognitive-complexity async (dispatch: Dispatch): Promise => { try { const dashboard = store.getState(); - const search = new URLSearchParams(history.location.search); const selectedDashboard = dashboard.dashboards.dashboards.find( (e) => e.uuid === uuid, @@ -105,7 +106,7 @@ export const SaveDashboard = ({ title: updatedTitle, timePreferance: updatedtimePreferance, yAxisUnit: updatedYAxisUnit, - panelTypes: search.get('graphType') as Widgets['panelTypes'], + panelTypes: graphType, queryData: { ...selectedWidget.queryData, }, @@ -151,4 +152,5 @@ export interface SaveDashboardProps { widgetId: Widgets['id']; dashboardId: string; yAxisUnit: Widgets['yAxisUnit']; + graphType: ITEMS; } From 53bfc33075c570b2905a7d3266367a825c3305d9 Mon Sep 17 00:00:00 2001 From: palashgdev Date: Tue, 7 Mar 2023 17:49:18 +0530 Subject: [PATCH 22/29] chore: panel Type is disabled for now (#2434) --- frontend/src/container/NewWidget/RightContainer/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/container/NewWidget/RightContainer/index.tsx b/frontend/src/container/NewWidget/RightContainer/index.tsx index eb80d3c62f..a666a90753 100644 --- a/frontend/src/container/NewWidget/RightContainer/index.tsx +++ b/frontend/src/container/NewWidget/RightContainer/index.tsx @@ -40,8 +40,9 @@ function RightContainer({ Panel Type