[Stack monitoring] Remove getAngularInjector and duplicated angular components #115593

estermv · 2021-10-19T15:47:26Z

Summary

This PR removes the getAngularInjector from the Legacy class that was throwing an error in the React app.

While removing it, I noticed that there were several components that were duplicated with a react suffix. I just removed the ones that were used in angular so we don't have unused code and to keep the PR easy to review, we can rename them in a follow-up PR.

elasticmachine · 2021-10-19T15:47:28Z

Pinging @elastic/logs-metrics-ui (Team:logs-metrics-ui)

neptunian · 2021-10-19T17:19:23Z

x-pack/plugins/monitoring/public/components/elasticsearch/index.ts

@@ -5,7 +5,6 @@
 * 2.0.
 */

-export { ElasticsearchOverview } from './overview';


would you mind instead renaming ElasticsearchOverviewReact to ElasticsearchOverview? and removing the React postfix imports? I meant to do that after removal of the angular when we could delete the old components. Same with the other components I duplicated. Or if you prefer I can do it after. Thanks!

I was going to do it as a separate PR, because I thought that it would be easier to review, but I can also do it as part of this.

estermv · 2021-10-20T10:12:49Z

@elasticmachine merge upstream

…d-code

estermv · 2021-10-20T12:07:12Z

@elasticmachine merge upstream

…d-code

estermv · 2021-10-20T14:25:47Z

@elasticmachine merge upstream

…d-code

kibanamachine · 2021-10-20T16:49:45Z

💛 Build succeeded, but was flaky

continuous-integration/kibana-ci/pull-request
Commit: 24fc452
Storybooks Preview
Flaky suites:
- xpack-kibana-ciGroup6

Test Failures

Kibana Pipeline / general / X-Pack API Integration Tests.x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples·ts.apis Machine Learning jobs Categorization example endpoint - invalid, too many tokens.

Link to Jenkins

Standard Out

Failed Tests Reporter:
  - Test has not failed recently on tracked branches

[00:00:00]     │
[00:00:00]       └-: apis
[00:00:00]         └-> "before all" hook in "apis"
[00:10:50]         └-: Machine Learning
[00:10:50]           └-> "before all" hook in "Machine Learning"
[00:10:50]           └-> "before all" hook in "Machine Learning"
[00:10:50]             │ debg creating role ft_ml_source
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_ml_source]
[00:10:50]             │ debg creating role ft_ml_source_readonly
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_ml_source_readonly]
[00:10:50]             │ debg creating role ft_ml_dest
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_ml_dest]
[00:10:50]             │ debg creating role ft_ml_dest_readonly
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_ml_dest_readonly]
[00:10:50]             │ debg creating role ft_ml_ui_extras
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_ml_ui_extras]
[00:10:50]             │ debg creating role ft_default_space_ml_all
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_default_space_ml_all]
[00:10:50]             │ debg creating role ft_default_space1_ml_all
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_default_space1_ml_all]
[00:10:50]             │ debg creating role ft_all_spaces_ml_all
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_all_spaces_ml_all]
[00:10:50]             │ debg creating role ft_default_space_ml_read
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_default_space_ml_read]
[00:10:50]             │ debg creating role ft_default_space1_ml_read
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_default_space1_ml_read]
[00:10:50]             │ debg creating role ft_all_spaces_ml_read
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_all_spaces_ml_read]
[00:10:50]             │ debg creating role ft_default_space_ml_none
[00:10:50]             │ info [o.e.x.s.a.r.TransportPutRoleAction] [node-01] added role [ft_default_space_ml_none]
[00:10:50]             │ debg creating user ft_ml_poweruser
[00:10:50]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_poweruser]
[00:10:50]             │ debg created user ft_ml_poweruser
[00:10:50]             │ debg creating user ft_ml_poweruser_spaces
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_poweruser_spaces]
[00:10:51]             │ debg created user ft_ml_poweruser_spaces
[00:10:51]             │ debg creating user ft_ml_poweruser_space1
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_poweruser_space1]
[00:10:51]             │ debg created user ft_ml_poweruser_space1
[00:10:51]             │ debg creating user ft_ml_poweruser_all_spaces
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_poweruser_all_spaces]
[00:10:51]             │ debg created user ft_ml_poweruser_all_spaces
[00:10:51]             │ debg creating user ft_ml_viewer
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_viewer]
[00:10:51]             │ debg created user ft_ml_viewer
[00:10:51]             │ debg creating user ft_ml_viewer_spaces
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_viewer_spaces]
[00:10:51]             │ debg created user ft_ml_viewer_spaces
[00:10:51]             │ debg creating user ft_ml_viewer_space1
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_viewer_space1]
[00:10:51]             │ debg created user ft_ml_viewer_space1
[00:10:51]             │ debg creating user ft_ml_viewer_all_spaces
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_viewer_all_spaces]
[00:10:51]             │ debg created user ft_ml_viewer_all_spaces
[00:10:51]             │ debg creating user ft_ml_unauthorized
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_unauthorized]
[00:10:51]             │ debg created user ft_ml_unauthorized
[00:10:51]             │ debg creating user ft_ml_unauthorized_spaces
[00:10:51]             │ info [o.e.x.s.a.u.TransportPutUserAction] [node-01] added user [ft_ml_unauthorized_spaces]
[00:10:51]             │ debg created user ft_ml_unauthorized_spaces
[00:14:55]           └-: jobs
[00:14:55]             └-> "before all" hook in "jobs"
[00:14:55]             └-: Categorization example endpoint - 
[00:14:55]               └-> "before all" hook for "valid with good number of tokens"
[00:14:55]               └-> "before all" hook for "valid with good number of tokens"
[00:14:55]                 │ info [x-pack/test/functional/es_archives/ml/categorization] Loading "mappings.json"
[00:14:55]                 │ info [x-pack/test/functional/es_archives/ml/categorization] Loading "data.json.gz"
[00:14:55]                 │ info [o.e.c.m.MetadataCreateIndexService] [node-01] [ft_categorization] creating index, cause [api], templates [], shards [1]/[0]
[00:14:55]                 │ info [x-pack/test/functional/es_archives/ml/categorization] Created index "ft_categorization"
[00:14:55]                 │ debg [x-pack/test/functional/es_archives/ml/categorization] "ft_categorization" settings {"index":{"number_of_replicas":"0","number_of_shards":"1"}}
[00:14:56]                 │ info [x-pack/test/functional/es_archives/ml/categorization] Indexed 1501 docs into "ft_categorization"
[00:14:56]                 │ debg applying update to kibana config: {"dateFormat:tz":"UTC"}
[00:14:57]               └-> valid with good number of tokens
[00:14:57]                 └-> "before each" hook: global before each for "valid with good number of tokens"
[00:14:57]                 └- ✓ pass  (307ms)
[00:14:57]               └-> invalid, too many tokens.
[00:14:57]                 └-> "before each" hook: global before each for "invalid, too many tokens."
[00:14:57]                 │ info [r.suppressed] [node-01] path: /_analyze, params: {}
[00:14:57]                 │      org.elasticsearch.transport.RemoteTransportException: [node-01][127.0.0.1:6381][indices:admin/analyze[s]]
[00:14:57]                 │      Caused by: java.lang.IllegalStateException: The number of tokens produced by calling _analyze has exceeded the allowed maximum of [10000]. This limit can be set by changing the [index.analyze.max_token_count] index level setting.
[00:14:57]                 │      	at org.elasticsearch.action.admin.indices.analyze.TransportAnalyzeAction$TokenCounter.increment(TransportAnalyzeAction.java:397) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.admin.indices.analyze.TransportAnalyzeAction.simpleAnalyze(TransportAnalyzeAction.java:229) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.admin.indices.analyze.TransportAnalyzeAction.analyze(TransportAnalyzeAction.java:204) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.admin.indices.analyze.TransportAnalyzeAction.analyze(TransportAnalyzeAction.java:122) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.admin.indices.analyze.TransportAnalyzeAction.shardOperation(TransportAnalyzeAction.java:110) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.admin.indices.analyze.TransportAnalyzeAction.shardOperation(TransportAnalyzeAction.java:62) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.support.single.shard.TransportSingleShardAction.lambda$asyncShardOperation$0(TransportSingleShardAction.java:99) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.ActionRunnable.lambda$supply$0(ActionRunnable.java:47) [elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.action.ActionRunnable$2.doRun(ActionRunnable.java:62) ~[elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.common.util.concurrent.ThreadContext$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:737) [elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at org.elasticsearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:26) [elasticsearch-8.0.0-SNAPSHOT.jar:8.0.0-SNAPSHOT]
[00:14:57]                 │      	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136) [?:?]
[00:14:57]                 │      	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635) [?:?]
[00:14:57]                 │      	at java.lang.Thread.run(Thread.java:833) [?:?]
[00:14:58]                 └- ✖ fail: apis Machine Learning jobs Categorization example endpoint -  invalid, too many tokens.
[00:14:58]                 │       Error: expected 'partially_valid' to sort of equal 'invalid'
[00:14:58]                 │       + expected - actual
[00:14:58]                 │ 
[00:14:58]                 │       -partially_valid
[00:14:58]                 │       +invalid
[00:14:58]                 │       
[00:14:58]                 │       at Assertion.assert (/dev/shm/workspace/parallel/8/kibana/node_modules/@kbn/expect/expect.js:100:11)
[00:14:58]                 │       at Assertion.eql (/dev/shm/workspace/parallel/8/kibana/node_modules/@kbn/expect/expect.js:244:8)
[00:14:58]                 │       at Context.<anonymous> (test/api_integration/apis/ml/jobs/categorization_field_examples.ts:302:44)
[00:14:58]                 │       at runMicrotasks (<anonymous>)
[00:14:58]                 │       at processTicksAndRejections (node:internal/process/task_queues:96:5)
[00:14:58]                 │       at Object.apply (/dev/shm/workspace/parallel/8/kibana/node_modules/@kbn/test/target_node/functional_test_runner/lib/mocha/wrap_function.js:87:16)
[00:14:58]                 │ 
[00:14:58]                 │

Stack Trace

Error: expected 'partially_valid' to sort of equal 'invalid'
    at Assertion.assert (/dev/shm/workspace/parallel/8/kibana/node_modules/@kbn/expect/expect.js:100:11)
    at Assertion.eql (/dev/shm/workspace/parallel/8/kibana/node_modules/@kbn/expect/expect.js:244:8)
    at Context.<anonymous> (test/api_integration/apis/ml/jobs/categorization_field_examples.ts:302:44)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (node:internal/process/task_queues:96:5)
    at Object.apply (/dev/shm/workspace/parallel/8/kibana/node_modules/@kbn/test/target_node/functional_test_runner/lib/mocha/wrap_function.js:87:16) {
  actual: 'partially_valid',
  expected: 'invalid',
  showDiff: true
}

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id	before	after	diff
`monitoring`	523	516	-7

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id	before	after	diff
`monitoring`	489.1KB	485.3KB	-3.8KB

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id	before	after	diff
`monitoring`	20.2KB	20.1KB	-80.0B

History

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

kibanamachine · 2021-10-20T16:58:10Z

💔 Backport failed

Status	Branch	Result
❌	7.16	Commit could not be cherrypicked due to conflicts

To backport manually run:
node scripts/backport --pr 115593

…omponents (elastic#115593) * remove getAngularInjector and old angular components * Remove suffix from CcrShardReact component * Remove suffix from ElasticsearchOverviewReact component * Remove suffix from indexReact component * Remove suffix from NodeReact component * Remove suffix from ShardActivityReact * Remove suffix from ShardAllocationReact component and its childs * Fix import * fix translations Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/monitoring/public/components/elasticsearch/node/node.js

…gular components (#115593) (#115826) * [Stack monitoring] Remove getAngularInjector and duplicated angular components (#115593) * remove getAngularInjector and old angular components * Remove suffix from CcrShardReact component * Remove suffix from ElasticsearchOverviewReact component * Remove suffix from indexReact component * Remove suffix from NodeReact component * Remove suffix from ShardActivityReact * Remove suffix from ShardAllocationReact component and its childs * Fix import * fix translations Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/monitoring/public/components/elasticsearch/node/node.js * Fix missing code not backported from #52276 Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

remove getAngularInjector and old angular components

78adf70

estermv requested a review from a team as a code owner October 19, 2021 15:47

estermv requested review from a team October 19, 2021 15:47

neptunian reviewed Oct 19, 2021

View reviewed changes

kibanamachine and others added 9 commits October 20, 2021 06:12

Merge branch 'master' into 115499-remove-getangularinjector-and-unuse…

56d84b9

…d-code

Remove suffix from CcrShardReact component

21a88a8

Remove suffix from ElasticsearchOverviewReact component

dc6609c

Remove suffix from indexReact component

610ac6d

Remove suffix from NodeReact component

5fe5b8a

Remove suffix from ShardActivityReact

99fe6e8

Remove suffix from ShardAllocationReact component and its childs

b65a49a

Fix import

32b972c

fix translations

1ca68c6

Merge branch 'master' into 115499-remove-getangularinjector-and-unuse…

363b9fc

…d-code

estermv requested a review from neptunian October 20, 2021 12:07

Merge branch 'master' into 115499-remove-getangularinjector-and-unuse…

24fc452

…d-code

neptunian approved these changes Oct 20, 2021

View reviewed changes

estermv merged commit 7b7079b into elastic:master Oct 20, 2021

estermv mentioned this pull request Oct 20, 2021

[7.16] [Stack monitoring] Remove getAngularInjector and duplicated angular components (#115593) #115826

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Stack monitoring] Remove getAngularInjector and duplicated angular components #115593

[Stack monitoring] Remove getAngularInjector and duplicated angular components #115593

estermv commented Oct 19, 2021

elasticmachine commented Oct 19, 2021

neptunian Oct 19, 2021 •

edited

Loading

estermv Oct 20, 2021

estermv commented Oct 20, 2021

estermv commented Oct 20, 2021

estermv commented Oct 20, 2021

kibanamachine commented Oct 20, 2021

Standard Out

Stack Trace

kibanamachine commented Oct 20, 2021

[Stack monitoring] Remove getAngularInjector and duplicated angular components #115593

[Stack monitoring] Remove getAngularInjector and duplicated angular components #115593

Conversation

estermv commented Oct 19, 2021

Summary

elasticmachine commented Oct 19, 2021

neptunian Oct 19, 2021 • edited Loading

Choose a reason for hiding this comment

estermv Oct 20, 2021

Choose a reason for hiding this comment

estermv commented Oct 20, 2021

estermv commented Oct 20, 2021

estermv commented Oct 20, 2021

kibanamachine commented Oct 20, 2021

💛 Build succeeded, but was flaky

Test Failures

Standard Out

Stack Trace

Metrics [docs]

Module Count

Async chunks

Page load bundle

History

kibanamachine commented Oct 20, 2021

💔 Backport failed

neptunian Oct 19, 2021 •

edited

Loading