add erda orgName in selector when download logs

chengjoey · Apr 22, 2024 · 4edf49c · 4edf49c
1 parent 24f53eb
commit 4edf49c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci-it.yml b/.github/workflows/ci-it.yml
@@ -230,7 +230,10 @@ jobs:
           rm -fr ./coverage/proto-go
           rm -fr ./coverage/pure-coverage
       - name: Upload coverage to Codecov
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
+          echo ${#CODECOV_TOKEN}
           curl -s https://codecov.io/bash | bash -s - -s ./coverage/
       - name: Upload combined coverage reports to artifact
         uses: actions/upload-artifact@v3

diff --git a/internal/tools/monitor/core/log/query/log.query.service.go b/internal/tools/monitor/core/log/query/log.query.service.go
@@ -704,7 +704,7 @@ func toQuerySelector(req Request) (*storage.Selector, error) {
 		}
 		if meta := byExpressionRequest.GetQueryMeta(); meta != nil {
 			sel.Meta = storage.QueryMeta{
-				OrgNames:              []string{meta.GetOrgName()},
+				OrgNames:              []string{meta.GetOrgName(), "erda"},
 				MspEnvIds:             meta.GetMspEnvIds(),
 				Highlight:             meta.GetHighlight(),
 				PreferredBufferSize:   int(meta.GetPreferredBufferSize()),

diff --git a/internal/tools/monitor/core/log/query/log.query.service_test.go b/internal/tools/monitor/core/log/query/log.query.service_test.go
@@ -130,7 +130,7 @@ func Test_toQuerySelector(t *testing.T) {
 					},
 				},
 				Meta: storage.QueryMeta{
-					OrgNames:              []string{"erda"},
+					OrgNames:              []string{"erda", "erda"},
 					PreferredBufferSize:   10,
 					PreferredIterateStyle: storage.Scroll,
 				},

diff --git a/internal/tools/monitor/core/log/query/routes.go b/internal/tools/monitor/core/log/query/routes.go
@@ -136,7 +136,7 @@ func (p *provider) downloadLog(w http.ResponseWriter, r *http.Request, req *LogR
 			if req.IsFallBack {
 				sel.Options[storage.IsFallBack] = true
 			}
-			p.logQueryService.tryFillQueryMeta(r.Context(), sel, r.Header.Get("org"))
+			p.logQueryService.tryFillQueryMeta(r.Context(), sel, r.Header.Get("org"), "erda")
 			return sel, nil
 		},
 		func(item *pb.LogItem) error {