Merge pull request #7228 from cockroachdb/marc/add_index_usage_to_graphs

UI: add "rocksdb.estimate-table-readers-mem" to graphs.
cockroachdb · Jun 15, 2016 · a51f9e4 · a51f9e4
2 parents c465f23 + be3301d
commit a51f9e4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/ui/Makefile b/ui/Makefile
@@ -47,8 +47,8 @@ CSS_TARGET              := build/app.css
 CSS_DEBUG_TARGET        := build/app_debug.css
 REMOTE_DEPS             := npm.installed bower.installed typings.installed
 INDEX                   := index.html
-GOBINDATA_FONTS         := ./fonts/*
-GOBINDATA_ASSETS        := ./assets/*
+GOBINDATA_FONTS         := ./fonts/
+GOBINDATA_ASSETS        := ./assets/
 GOBINDATA_DEPS          := $(TYPESCRIPT_TARGET) $(CSS_TARGET)
 GOBINDATA_DEBUG_DEPS    := $(TYPESCRIPT_TARGET) $(CSS_DEBUG_TARGET)
 GOBINDATA_SOURCES       := $(NODE_MODULES)/lodash/lodash.min.js \

diff --git a/ui/embedded.go b/ui/embedded.go
diff --git a/ui/next/app/containers/nodeGraphs.tsx b/ui/next/app/containers/nodeGraphs.tsx
@@ -150,6 +150,7 @@ export default class extends React.Component<RouteComponentProps<any, any>, {}>
                 <Metric name="cr.store.rocksdb.block.cache.usage" title="Block Cache" />
                 <Metric name="cr.store.rocksdb.block.cache.pinned-usage" title="Iterators" />
                 <Metric name="cr.store.rocksdb.memtable.total-size" title="Memtable" />
+                <Metric name="cr.store.rocksdb.table-readers-mem-estimate" title="Index" />
               </Axis>
             </LineGraph>
 

diff --git a/ui/next/app/containers/nodesGraphs.tsx b/ui/next/app/containers/nodesGraphs.tsx
@@ -145,6 +145,7 @@ export default class extends React.Component<{}, {}> {
                 <Metric name="cr.store.rocksdb.block.cache.usage" title="Block Cache" />
                 <Metric name="cr.store.rocksdb.block.cache.pinned-usage" title="Iterators" />
                 <Metric name="cr.store.rocksdb.memtable.total-size" title="Memtable" />
+                <Metric name="cr.store.rocksdb.table-readers-mem-estimate" title="Index" />
               </Axis>
             </LineGraph>
 

diff --git a/ui/ts/pages/nodes.ts b/ui/ts/pages/nodes.ts
@@ -407,7 +407,9 @@ module AdminViews {
               Metrics.Select.Avg(_storeMetric("rocksdb.block.cache.pinned-usage"))
                 .title("Iterators"),
               Metrics.Select.Avg(_storeMetric("rocksdb.memtable.total-size"))
-                .title("Memtable")
+                .title("Memtable"),
+              Metrics.Select.Avg(_storeMetric("rocksdb.table-readers-mem-estimate"))
+                .title("Index")
             ).format(Utils.Format.Bytes).title("Engine Memory Usage")
           );
           this._addChart(
@@ -1008,7 +1010,10 @@ module AdminViews {
                 .title("Iterators"),
               Metrics.Select.Avg(_storeMetric("rocksdb.memtable.total-size"))
                 .sources(this._storeIds)
-                .title("Memtable")
+                .title("Memtable"),
+              Metrics.Select.Avg(_storeMetric("rocksdb.table-readers-mem-estimate"))
+                .sources(this._storeIds)
+                .title("Index")
             ).format(Utils.Format.Bytes).title("Engine Memory Usage")
           );
           this._addChart(