[tribe] Creates single interface to retrieve clusters by tylersmalley · Pull Request #9266 · elastic/kibana

tylersmalley · 2016-11-30T00:06:46Z

Previously we had been adding interfaces directly to the Hapi plugin (client, ElasticsearchClientLogging, createClient, callWithRequestFactory, callWithRequest). Since we are now further expanding on that functionality but adding another cluster (Admin/Data), it's time to clean up the interface.

This adds getCluster and createCluster to server.plugins.elasticsearch. getCluster now returns a cluster object which contains the config (including log), createClient, callWithRequestFactory and callWithRequest.

For #9132

tylersmalley · 2016-11-30T00:11:01Z

src/core_plugins/elasticsearch/index.js

Not set on adding, but needed to make it configurable for the tests to complete faster. I have heard of users manually changing the constant in health_check.js.

jbudz

Thoughts on renaming callAsKibanaUser --> callAsKibanaServerUser or callWithServerAuthentication/something along those lines to avoid any ambiguity? In the case of not using the security plugin, the default user isn't necessarily kibana.

jbudz · 2016-11-30T15:21:57Z

src/core_plugins/elasticsearch/lib/health_check.js

is this defined?

callAsKibanaUser? Yeah, it's being passed as callAdminAsKibanaUser which is defined on line 20. I can see how that is confusing. Thoughts on what we can rename it to? caller?

Ah okay, got it.

jbudz · 2016-11-30T15:22:33Z

src/core_plugins/elasticsearch/lib/health_check.js

jbudz · 2016-11-30T15:31:29Z

jenkins, test this

jbudz · 2016-11-30T17:31:39Z

Test failures seem to be legitimate

Previous we had been adding interfaces directly to the Hapi plugin (client, ElasticsearchClientLogging, createClient, callWithRequestFactory, callWithRequest). Since we are now further expanding on that functionality but adding another cluster (Admin/Data), it's time to clean up the interface. This adds getCluster and createCluster to server.plugins.elasticsearch. getCluster now returns a cluster object which contains the config (including log), createClient, callWithRequestFactory and callWithRequest. Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley · 2016-12-01T01:10:37Z

@jbudz

Thoughts on renaming callAsKibanaUser --> callAsKibanaServerUser or callWithServerAuthentication/something along those lines to avoid any ambiguity? In the case of not using the security plugin, the default user isn't necessarily kibana.

What about calling it call? So, getCluster('admin').call(). callWithRequest is really just the same, but takes the request into context.

Thoughts?

tylersmalley · 2016-12-01T01:18:33Z

@jbudz, tests are now passing.

jbudz · 2016-12-01T20:16:27Z

@tylersmalley call may be confusing with Function.call

jbudz · 2016-12-01T20:27:31Z

src/core_plugins/elasticsearch/lib/cluster.js

+      }
+
+      if (!api) {
+        throw new Error(`callWithRequest called with an invalid endpoint: ${endpoint}`);


callWithRequest = callAsKibanaUser?

tylersmalley · 2016-12-01T20:29:12Z

Ah, I spaced on that. We could do send and sendWithRequest.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley added the Team:Operations Kibana-Operations Team label Nov 30, 2016

tylersmalley changed the title ~~[tribe] Creates single interface to retreive clusters~~ [tribe] Creates single interface to retrieve clusters Nov 30, 2016

tylersmalley force-pushed the tribe-getcluster branch from 1d3f027 to 2ca13be Compare November 30, 2016 00:07

jbudz self-assigned this Nov 30, 2016

tylersmalley commented Nov 30, 2016

View reviewed changes

jbudz reviewed Nov 30, 2016

View reviewed changes

tylersmalley added 2 commits November 30, 2016 16:48

Resolves browser tests

56c1699

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley force-pushed the tribe-getcluster branch from fd17313 to 56c1699 Compare December 1, 2016 00:54

jbudz reviewed Dec 1, 2016

View reviewed changes

jbudz approved these changes Dec 1, 2016

View reviewed changes

tylersmalley force-pushed the tribe-getcluster branch 3 times, most recently from c2b16b9 to a50eaa1 Compare December 5, 2016 15:35

Added tests for cluster.js

3be9a5d

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

tylersmalley force-pushed the tribe-getcluster branch from a50eaa1 to 3be9a5d Compare December 5, 2016 15:43

tylersmalley merged commit adf4a82 into elastic:tribe-node-support Dec 5, 2016

tylersmalley deleted the tribe-getcluster branch December 5, 2016 16:21

Conversation

tylersmalley commented Nov 30, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tylersmalley Nov 30, 2016

Choose a reason for hiding this comment

Uh oh!

jbudz left a comment

Choose a reason for hiding this comment

Uh oh!

jbudz Nov 30, 2016

Choose a reason for hiding this comment

Uh oh!

tylersmalley Dec 1, 2016

Choose a reason for hiding this comment

Uh oh!

jbudz Dec 1, 2016

Choose a reason for hiding this comment

Uh oh!

jbudz Nov 30, 2016

Choose a reason for hiding this comment

Uh oh!

jbudz commented Nov 30, 2016

Uh oh!

jbudz commented Nov 30, 2016

Uh oh!

tylersmalley commented Dec 1, 2016

Uh oh!

tylersmalley commented Dec 1, 2016

Uh oh!

jbudz commented Dec 1, 2016

Uh oh!

jbudz Dec 1, 2016

Choose a reason for hiding this comment

Uh oh!

tylersmalley commented Dec 1, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tylersmalley commented Nov 30, 2016 •

edited

Loading