Merge pull request #1849 from pweil-/haproxy-stats

Merged by openshift-bot
openshift · Apr 23, 2015 · e6efd04 · e6efd04
2 parents 76dd5ee + 9df5b39
commit e6efd04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/images/router/haproxy/conf/haproxy-config.template b/images/router/haproxy/conf/haproxy-config.template
@@ -23,6 +23,14 @@ defaults
   # Long timeout for WebSocket connections.
   timeout tunnel 1h
 
+listen stats :1936
+    mode http
+    stats enable
+    stats hide-version
+    stats realm Haproxy\ Statistics
+    stats uri /
+    stats auth admin:cEVu2hUb
+
 frontend public
   bind :80
   mode http

diff --git a/pkg/cmd/experimental/router/router.go b/pkg/cmd/experimental/router/router.go
@@ -74,7 +74,7 @@ func NewCmdRouter(f *clientcmd.Factory, parentName, name string, out io.Writer)
 		ImageTemplate: variable.NewDefaultImageTemplate(),
 
 		Labels:   defaultLabel,
-		Ports:    "80:80,443:443",
+		Ports:    "80:80,443:443,1936:1936",
 		Replicas: 1,
 	}