Merge pull request #145 from StrongMonkey/more-fix2

fix monitoing, no auth for grafana
rancher · Jan 14, 2019 · 44de84d · 44de84d
2 parents 95780bb + 5378fa6
commit 44de84d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/features/monitoring/feature.go b/features/monitoring/feature.go
@@ -16,6 +16,10 @@ func Register(ctx context.Context, rContext *types.Context) error {
 		FeatureName: "monitoring",
 		FeatureSpec: v1.FeatureSpec{
 			Description: "Monitoring and Telemetry",
+			Answers: map[string]string{
+				"GRAFANA_USERNAME": "admin",
+				"GRAFANA_PASSWORD": "admin",
+			},
 		},
 		SystemStacks: []*systemstack.SystemStack{
 			systemstack.NewSystemStack(rContext.Rio.Stack, "istio-telemetry", riov1.StackSpec{