From 7961599b2e41c71720a42b3bfde641f7529f05fe Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 22 Nov 2016 11:05:54 -0800 Subject: PLT-4357 adding performance monitoring (#4622) * WIP * WIP * Adding metrics collection * updating vendor packages * Adding metrics to config * Adding admin console page for perf monitoring * Updating glide * switching to tylerb/graceful --- utils/config.go | 4 ++++ utils/license.go | 1 + 2 files changed, 5 insertions(+) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index 0f5d69a13..7889ea9ac 100644 --- a/utils/config.go +++ b/utils/config.go @@ -329,6 +329,10 @@ func getClientConfig(c *model.Config) map[string]string { props["EnableCluster"] = strconv.FormatBool(*c.ClusterSettings.Enable) } + if *License.Features.Cluster { + props["EnableMetrics"] = strconv.FormatBool(*c.MetricsSettings.Enable) + } + if *License.Features.GoogleOAuth { props["EnableSignUpWithGoogle"] = strconv.FormatBool(c.GoogleSettings.Enable) } diff --git a/utils/license.go b/utils/license.go index 4d6387788..456a731a1 100644 --- a/utils/license.go +++ b/utils/license.go @@ -123,6 +123,7 @@ func getClientLicense(l *model.License) map[string]string { props["MFA"] = strconv.FormatBool(*l.Features.MFA) props["SAML"] = strconv.FormatBool(*l.Features.SAML) props["Cluster"] = strconv.FormatBool(*l.Features.Cluster) + props["Metrics"] = strconv.FormatBool(*l.Features.Metrics) props["GoogleOAuth"] = strconv.FormatBool(*l.Features.GoogleOAuth) props["Office365OAuth"] = strconv.FormatBool(*l.Features.Office365OAuth) props["Compliance"] = strconv.FormatBool(*l.Features.Compliance) -- cgit v1.2.3-1-g7c22