-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Stats API #11992
Merged
Merged
Stats API #11992
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8ee2960
Simple stats api POC
stacey-gammon b571688
Code review clean up
stacey-gammon 4488f1b
reply with promise, avoids async function
stacey-gammon e1145d3
Merge branch 'master' of https://github.com/elastic/kibana into new-s…
stacey-gammon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { statsMixin } from './stats_mixin'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import { SavedObjectsClient } from '../saved_objects/client'; | ||
|
||
async function getStatsForType(savedObjectsClient, type) { | ||
const { total } = await savedObjectsClient.find({ type, perPage: 0 }); | ||
return { total }; | ||
} | ||
|
||
export async function getStats(kibanaIndex, callAdminCluster) { | ||
const savedObjectsClient = new SavedObjectsClient(kibanaIndex, callAdminCluster); | ||
const types = ['dashboard', 'visualization', 'search', 'index-pattern']; | ||
const requests = types.map(type => getStatsForType(savedObjectsClient, type)); | ||
const results = await Promise.all(requests); | ||
const stats = {}; | ||
|
||
results.forEach((statsForType, index) => { | ||
stats[types[index]] = statsForType; | ||
}); | ||
|
||
stats.index = kibanaIndex; | ||
return stats; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { getStats } from './stats'; | ||
|
||
export function statsMixin(kbnServer, server) { | ||
server.route({ | ||
method: 'GET', | ||
path: '/api/stats', | ||
handler: function (request, reply) { | ||
const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin'); | ||
const callAdminCluster = (...args) => callWithInternalUser(...args); | ||
|
||
const stats = getStats( | ||
server.config().get('kibana.index'), | ||
callAdminCluster | ||
); | ||
|
||
return reply(stats); | ||
} | ||
}); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can reply with the promise instead of awaiting it. Just a nitpick, doesn't need to be changed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And then the handler doesn't need to be marked as
async
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
neat
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stacey-gammon
Unless not modifying the return actually works? I would be surprised if that were the case, but JS has done crazier things.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pickypg, It worked when I tested it, but using the above doesn't seem to work (I don't see an error, it just hangs). Do I need to wrap your return with the reply?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
async
/await
is all just sugar on top ofPromise
, so the method is already returning aPromise
that you choose toawait
against to get the value (or throw the exception). So I'm guessing if it worked, then you simply can stick with what you've got and can avoid my extra fluff.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh doh! Yes, my example was missing
reply
wrapping thePromise
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You shouldn't need
Promise.resolve
sincegetStats
returns a promise. Just need to return thegetStats
call.