[Monitoring] Fixed internal monitoring check by igoristic · Pull Request #79241 · elastic/kibana

igoristic · 2020-10-02T01:11:57Z

Resolves #79135

This was due to the addition of metricbeat-* indices, since their _index field does not have the -mb- marker

elasticmachine · 2020-10-02T01:11:59Z

Pinging @elastic/stack-monitoring (Team:Monitoring)

chrisronline

This isn't part of this PR, but why don't we have a range query on this: https://github.com/elastic/kibana/pull/79241/files#diff-e856f71a4bdab161dc03994cf4d8317fR21?

If the user has migrated from legacy to Metricbeat collection, they will still have their old legacy indices around for at least 7 days. Maybe we should only look back one day or something? Or maybe we look at the timestamp of the last legacy collected document and determine if it's enough time back, and we see a -mb- one too?

…nal_check_fix

.../plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts

…nal_check_fix

igoristic · 2020-10-02T23:12:19Z

@elasticmachine merge upstream

chrisronline · 2020-10-03T17:17:16Z

x-pack/plugins/monitoring/public/services/clusters.js

        return Promise.resolve();
      }
-
+      const css = window.location.hash.split('?')[0] === '#/home' ? 'css' : 'single';


I'm not a big fan of hard-coding a URL when I think we can manage without it.

monitoringClusters is only called from a few places, and we can just provide an additional parameter to the function call for ccs and we can specify which one from the invokers.

WDYT?

@chrisronline Actually this won't work. I tried passing it here:

kibana/x-pack/plugins/monitoring/public/views/cluster/listing/index.js

Line 20 in 7d8027d

return monitoringClusters(undefined, undefined, CODE_PATHS);

but looks like monitoringClusters executes somewhere else before hand (probably in a routeInit), which sets the once variable before we can check the param. This means I would have to do some extra logic to determine the "real" origin (not as clean as the one liner above)

…nal_check_fix

chrisronline

LGTM!

igoristic · 2020-10-05T15:22:03Z

@elasticmachine merge upstream

into internal_check_fix

…nal_check_fix

chrisronline · 2020-10-05T19:08:40Z

Hold up on merging this. I'm testing this again and seeing some unexpected behavior. I'll update when I know more

chrisronline · 2020-10-05T19:28:50Z

x-pack/plugins/monitoring/public/services/clusters.js

        return Promise.resolve();
      }
-
+      const ccs = window.location.hash.split('?')[0] === '#/home' ? 'ccs' : 'single';


Instead of this, why don't we just get the globalState and add globalState.ccs directly? The prefixIndexPattern code is designed to accept a ccs string like this

…nal_check_fix

kibanamachine · 2020-10-08T13:09:43Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 8856761

Metrics [docs]

async chunks size

id	before	after	diff
`monitoring`	1.2MB	1.2MB	+68.0B

History

💚 Build #79759 succeeded c78e30f
💚 Build #79676 succeeded 1104823
💚 Build #79364 succeeded 7d8027d
💔 Build #79334 failed f2eaf07
💚 Build #79266 succeeded c79fe80

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

chrisronline

LGTM!

* fixed internal monitoring check * Added range filter * Added single vs ccs condtion * Fixed spelling * Passing global state ccs Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

igoristic · 2020-10-08T23:24:45Z

Backport:
7.x: f61fcb8
7.10: 0379b9a

* master: (23 commits) Table visualization renderer (elastic#79455) Migrate Jest JUnit reporter to TS (elastic#79919) store sorted bundleRefExportIds (elastic#80011) update chromedriver dependency to 86.0.0 (elastic#79972) [Security Solution][Case] Fix bug when changing connectors (elastic#80002) [kbn/std] add observable helpers to aid with rxjs 7 upgrade (elastic#79752) [Security Solution][Resolver] Pill numbers in compact notation (elastic#80038) [Logs UI] Sync logs timerange with wider Kibana (elastic#79444) [DOCS] Adds quick start (elastic#78822) [Ingest Manager]Fix ingest manager UI renaming (elastic#80036) [Monitoring] Fixed internal monitoring check (elastic#79241) [Security Solution][Exception Modal] Removes list operators in exception modal for EQL rules (elastic#79871) Update development documentation about REST API best practices (elastic#80009) [Monitoring] Improve indices loading against larger metricbeat-* indices (elastic#79190) [CI] Move kibana build dir outside of repo for functional tests (elastic#80018) [kbn/optimizer] bump low or add missing limits when updating automatically (elastic#80013) [Enterprise Search] Added a Credentials page to App Search (elastic#79749) [DOCS] Canvas refresh for 7.10 (elastic#80017) [TSVB] Add ignore global filters to series options (elastic#79337) Remove this check (elastic#79202) ...

* fixed internal monitoring check * Added range filter * Added single vs ccs condtion * Fixed spelling * Passing global state ccs Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/monitoring/public/services/clusters.js

fixed internal monitoring check

3f79c38

igoristic added Team:Monitoring Stack Monitoring team v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.10.0 labels Oct 2, 2020

igoristic requested a review from a team October 2, 2020 01:11

chrisronline reviewed Oct 2, 2020

View reviewed changes

igoristic added 2 commits October 2, 2020 13:25

Merge branch 'master' of https://github.com/elastic/kibana into inter…

ad18606

…nal_check_fix

Added range filter

c79fe80

igoristic requested a review from chrisronline October 2, 2020 17:44

chrisronline suggested changes Oct 2, 2020

View reviewed changes

.../plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/internal_monitoring.ts Outdated Show resolved Hide resolved

igoristic added 3 commits October 2, 2020 15:37

Merge branch 'master' of https://github.com/elastic/kibana into inter…

4d4c0be

…nal_check_fix

Merge branch 'master' of https://github.com/elastic/kibana into inter…

0492e27

…nal_check_fix

Added single vs ccs condtion

f2eaf07

igoristic requested a review from chrisronline October 2, 2020 21:05

Merge branch 'master' into internal_check_fix

7d8027d

chrisronline reviewed Oct 3, 2020

View reviewed changes

Merge branch 'master' of https://github.com/elastic/kibana into inter…

8724593

…nal_check_fix

chrisronline approved these changes Oct 5, 2020

View reviewed changes

kibanamachine and others added 5 commits October 5, 2020 11:22

Merge branch 'master' into internal_check_fix

1104823

Merge branch 'internal_check_fix' of https://github.com/igoristic/kibana

1d54a65

into internal_check_fix

Merge branch 'master' of https://github.com/elastic/kibana into inter…

c645dc7

…nal_check_fix

Merge branch 'master' of https://github.com/elastic/kibana into inter…

1969807

…nal_check_fix

Fixed spelling

c78e30f

chrisronline suggested changes Oct 5, 2020

View reviewed changes

Merge branch 'master' of https://github.com/elastic/kibana into inter…

096b18d

…nal_check_fix

igoristic added 2 commits October 8, 2020 06:51

Merge branch 'master' of https://github.com/elastic/kibana into inter…

4751894

…nal_check_fix

Passing global state ccs

8856761

igoristic requested a review from chrisronline October 8, 2020 11:34

chrisronline approved these changes Oct 8, 2020

View reviewed changes

igoristic merged commit cd4df4b into elastic:master Oct 8, 2020

igoristic deleted the internal_check_fix branch October 8, 2020 19:54

igoristic added v7.11.0 and removed v7.10.0 labels Oct 8, 2020

igoristic mentioned this pull request Oct 8, 2020

[7.x] [Monitoring] Fixed internal monitoring check (#79241) #80067

Merged

igoristic mentioned this pull request Oct 28, 2020

[7.10] [Monitoring] Fixed internal monitoring check (#79241) #81955

Merged

igoristic added backported v7.10.0 labels Oct 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Monitoring] Fixed internal monitoring check#79241

[Monitoring] Fixed internal monitoring check#79241
igoristic merged 16 commits intoelastic:masterfrom
igoristic:internal_check_fix

igoristic commented Oct 2, 2020

Uh oh!

elasticmachine commented Oct 2, 2020

Uh oh!

chrisronline left a comment

Uh oh!

Uh oh!

igoristic commented Oct 2, 2020

Uh oh!

chrisronline Oct 3, 2020

Uh oh!

igoristic Oct 5, 2020

Uh oh!

chrisronline left a comment

Uh oh!

igoristic commented Oct 5, 2020

Uh oh!

chrisronline commented Oct 5, 2020

Uh oh!

chrisronline Oct 5, 2020

Uh oh!

kibanamachine commented Oct 8, 2020

Uh oh!

chrisronline left a comment

Uh oh!

igoristic commented Oct 8, 2020 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

igoristic commented Oct 2, 2020

Uh oh!

elasticmachine commented Oct 2, 2020

Uh oh!

chrisronline left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

igoristic commented Oct 2, 2020

Uh oh!

chrisronline Oct 3, 2020

Choose a reason for hiding this comment

Uh oh!

igoristic Oct 5, 2020

Choose a reason for hiding this comment

Uh oh!

chrisronline left a comment

Choose a reason for hiding this comment

Uh oh!

igoristic commented Oct 5, 2020

Uh oh!

chrisronline commented Oct 5, 2020

Uh oh!

chrisronline Oct 5, 2020

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Oct 8, 2020

💚 Build Succeeded

Metrics [docs]

async chunks size

History

Uh oh!

chrisronline left a comment

Choose a reason for hiding this comment

Uh oh!

igoristic commented Oct 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

igoristic commented Oct 8, 2020 •

edited

Loading