Skip to content

Commit

Permalink
Merge pull request #855 from basho/bugfix/jra/yz_stats_2
Browse files Browse the repository at this point in the history
Add Yokozuna stats so they appear in console and http /stats
  • Loading branch information
bowrocker committed Feb 24, 2014
2 parents 4cf8e64 + b0abcf9 commit eb3a05c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/riak_kv_stat_bc.erl
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ produce_stats() ->
ring_stats(),
config_stats(),
app_stats(),
memory_stats()
memory_stats(),
yz_stat:search_stats()
]).

%% Stats in folsom are stored with tuples as keys, the
Expand Down
2 changes: 1 addition & 1 deletion src/riak_kv_wm_stats.erl
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ pretty_print(RD1, C1=#ctx{}) ->
get_stats() ->
{value, {disk, Disk}, Stats} = lists:keytake(disk, 1, riak_kv_stat:get_stats()),
DiskFlat = [{struct, [{id, list_to_binary(Id)}, {size, Size}, {used, Used}]} || {Id, Size, Used} <- Disk],
lists:append([Stats, [{disk, DiskFlat}], riak_core_stat:get_stats()]).
lists:append([Stats, [{disk, DiskFlat}], riak_core_stat:get_stats(), yz_stat:search_stats()]).

0 comments on commit eb3a05c

Please sign in to comment.