From d0527d28dffc4cf58a3a21e380c1d0a0de3a84f0 Mon Sep 17 00:00:00 2001 From: Roland Schilter Date: Thu, 29 Jun 2017 14:15:49 +0200 Subject: [PATCH] Fix linting, cleanup, and add example to flag --- .../components/node-details/node-details-health-link-item.js | 4 ++-- prog/main.go | 2 +- render/detailed/links.go | 4 ++-- render/expected/expected.go | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/app/scripts/components/node-details/node-details-health-link-item.js b/client/app/scripts/components/node-details/node-details-health-link-item.js index a70ef35bf..a536b51d8 100644 --- a/client/app/scripts/components/node-details/node-details-health-link-item.js +++ b/client/app/scripts/components/node-details/node-details-health-link-item.js @@ -29,8 +29,8 @@ export default class NodeDetailsHealthLinkItem extends React.Component { } render() { - const {links, withoutGraph, ...props} = this.props; - const href = this.buildHref(links[props.id] && links[props.id].url); + const {links, withoutGraph, id, ...props} = this.props; + const href = this.buildHref(links[id] && links[id].url); if (!href) return ; diff --git a/prog/main.go b/prog/main.go index 02d254e16..bf6c7514b 100644 --- a/prog/main.go +++ b/prog/main.go @@ -356,7 +356,7 @@ func setupFlags(flags *flags) { flag.IntVar(&flags.app.memcachedCompressionLevel, "app.memcached.compression", gzip.DefaultCompression, "How much to compress reports stored in memcached.") flag.StringVar(&flags.app.userIDHeader, "app.userid.header", "", "HTTP header to use as userid") flag.BoolVar(&flags.app.externalUI, "app.externalUI", false, "Point to externally hosted static UI assets") - flag.StringVar(&flags.app.metricsGraphURL, "app.metrics-graph", "", "Enable extended metrics graph by providing a templated URL (supports :orgID and :query)") + flag.StringVar(&flags.app.metricsGraphURL, "app.metrics-graph", "", "Enable extended metrics graph by providing a templated URL (supports :orgID and :query). Example: --app.metric-graph=/prom/:orgID/notebook/new") flag.IntVar(&flags.app.blockProfileRate, "app.block.profile.rate", 0, "If more than 0, enable block profiling. The profiler aims to sample an average of one blocking event per rate nanoseconds spent blocked.") diff --git a/render/detailed/links.go b/render/detailed/links.go index f811fc429..13f8c52e0 100644 --- a/render/detailed/links.go +++ b/render/detailed/links.go @@ -66,7 +66,7 @@ func SetMetricsGraphURL(url string) { metricsGraphURL = url } -// NodeLinks returns the links of a node. The links are collected +// NodeMetricLinks returns the links of a node. The links are collected // by a predefined set but filtered depending on whether a query // is configured or not for the particular topology. func NodeMetricLinks(_ report.Report, n report.Node) []MetricLink { @@ -89,7 +89,7 @@ func NodeMetricLinks(_ report.Report, n report.Node) []MetricLink { return links } -// RenderLinks executes the templated links by supplying the node summary as data. +// RenderMetricLinks executes the templated links by supplying the node summary as data. // It returns the modified summary. func RenderMetricLinks(summary NodeSummary, n report.Node) NodeSummary { queries := topologyQueries[n.Topology] diff --git a/render/expected/expected.go b/render/expected/expected.go index 3024f3127..f687f501d 100644 --- a/render/expected/expected.go +++ b/render/expected/expected.go @@ -9,6 +9,7 @@ import ( "github.com/weaveworks/scope/test/fixture" ) +// Exported for testing. var ( circle = "circle" square = "square"