Add nginx metrics to prometheus

core/pkg/ingress/controller/controller.go

@@ -140,7 +140,7 @@ func newIngressController(config *Configuration) *GenericController {
 
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(glog.Infof)
-	eventBroadcaster.StartRecordingToSink(unversionedcore.EventSinkImpl{
+	eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{
 		Interface: config.Client.Core().Events(config.Namespace),
 	})
 

core/pkg/ingress/controller/launch.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/pflag"
 
-	"github.com/prometheus/client_golang/prometheus"
 	"k8s.io/kubernetes/pkg/api"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/restclient"
@@ -161,7 +161,7 @@ func registerHandlers(enableProfiling bool, port int, ic *GenericController) {
 		ic.cfg.Backend,
 	)
 
-	mux.Handle("/metrics", prometheus.Handler())
+	mux.Handle("/metrics", promhttp.Handler())
 
 	mux.HandleFunc("/build", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)

core/pkg/ingress/controller/metrics.go

@@ -16,7 +16,9 @@ limitations under the License.
 
 package controller
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
 
 const (
 	ns          = "ingress_controller"
@@ -27,9 +29,6 @@ const (
 func init() {
 	prometheus.MustRegister(reloadOperation)
 	prometheus.MustRegister(reloadOperationErrors)
-
-	reloadOperationErrors.WithLabelValues(reloadLabel).Set(0)
-	reloadOperation.WithLabelValues(reloadLabel).Set(0)
 }
 
 var (