upgrade vts to the latest version

controllers/nginx/pkg/cmd/controller/metrics.go

@@ -42,17 +42,23 @@ func (em exeMatcher) MatchAndName(nacl common.NameAndCmdline) (bool, string) {
 }
 
 func (n *NGINXController) setupMonitor(args []string) {
-	var enableVts = true
 
 	// TODO fix true
-	pc, err := newProcessCollector(true, exeMatcher{"nginx", args}, enableVts)
+	pc, err := newProcessCollector(true, exeMatcher{"nginx", args}, false)
 	if err != nil {
-		glog.Fatalf("unexpected error registering nginx collector: %v", err)
+		glog.Warningf("unexpected error registering nginx collector: %v", err)
 	}
+	n.namedProcessCollector = pc
+
 	err = prometheus.Register(pc)
 	if err != nil {
 		glog.Warningf("unexpected error registering nginx collector: %v", err)
 	}
+
+}
+
+func (n *NGINXController) reloadMonitor(enableVts *bool) {
+	n.namedProcessCollector.vtsCollector = enableVts
 }
 
 var (
@@ -225,7 +231,7 @@ type (
 		scrapeChan chan scrapeRequest
 		*proc.Grouper
 		fs           *proc.FS
-		vtsCollector bool
+		vtsCollector *bool
 	}
 )
 
@@ -234,21 +240,21 @@ func newProcessCollector(
 	n common.MatchNamer,
 	vtsCollector bool) (*namedProcessCollector, error) {
 
-	fs, err := proc.NewFS("/proc")
-	if err != nil {
-		return nil, err
-	}
+	//fs, err := proc.NewFS("/proc")
+	//if err != nil {
+	//	return nil, err
+	//}
 	p := &namedProcessCollector{
 		scrapeChan:   make(chan scrapeRequest),
 		Grouper:      proc.NewGrouper(children, n),
-		fs:           fs,
-		vtsCollector: vtsCollector,
+		//fs:           fs,
+		vtsCollector: &vtsCollector,
 	}
 
-	_, err = p.Update(p.fs.AllProcs())
-	if err != nil {
-		return nil, err
-	}
+	//_, err = p.Update(p.fs.AllProcs())
+	//if err != nil {
+	//	return nil, err
+	//}
 
 	go p.start()
 
@@ -266,7 +272,7 @@ func (p *namedProcessCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- memVirtualbytesDesc
 	ch <- startTimeDesc
 
-	if p.vtsCollector {
+	if p.vtsCollector == true {
 
 		ch <- vtsBytesDesc
 		ch <- vtsCacheDesc
@@ -306,7 +312,7 @@ func (p *namedProcessCollector) start() {
 		ch := req.results
 		p.scrapeNginxStatus(ch)
 
-		if p.vtsCollector {
+		if &p.vtsCollector {
 			p.scrapeVts(ch)
 		}
 

controllers/nginx/pkg/cmd/controller/nginx.go

@@ -108,6 +108,8 @@ type NGINXController struct {
 	storeLister ingress.StoreLister
 
 	binary string
+
+	namedProcessCollector *namedProcessCollector
 }
 
 // Start start a new NGINX master process running in foreground.
@@ -168,16 +170,21 @@ func (n *NGINXController) start(cmd *exec.Cmd, done chan error) {
 // Reload checks if the running configuration file is different
 // to the specified and reload nginx if required
 func (n NGINXController) Reload(data []byte) ([]byte, bool, error) {
-	if !n.isReloadRequired(data) {
-		return []byte("Reload not required"), false, nil
-	}
+	//if !n.isReloadRequired(data) {
+	//	return []byte("Reload not required"), false, nil
+	//}
+
+	cfg := ngx_template.ReadConfig(n.configmap.Data)
 
 	err := ioutil.WriteFile(cfgPath, data, 0644)
 	if err != nil {
 		return nil, false, err
 	}
 
+	n.reloadMonitor(&cfg.EnableVtsStatus)
+
 	o, e := exec.Command(n.binary, "-s", "reload").CombinedOutput()
+
 	return o, true, e
 }
 

controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl

@@ -60,7 +60,7 @@ http {
 
     client_header_buffer_size       {{ $cfg.ClientHeaderBufferSize }};
     large_client_header_buffers     {{ $cfg.LargeClientHeaderBuffers }};
-    
+
     http2_max_field_size            {{ $cfg.HTTP2MaxFieldSize }};
     http2_max_header_size           {{ $cfg.HTTP2MaxHeaderSize }};
 

images/nginx-slim/build.sh

@@ -19,7 +19,7 @@ set -e
 
 export NGINX_VERSION=1.11.10
 export NDK_VERSION=0.3.0
-export VTS_VERSION=0.1.11
+export VTS_VERSION=0.1.12
 export SETMISC_VERSION=0.31
 export LUA_VERSION=0.10.7
 export STICKY_SESSIONS_VERSION=08a395c66e42