Fixes

Signed-off-by: Matt Lord <mattalord@gmail.com>

Author: mattlord

pkg/operator/vttablet/flags.go

@@ -18,6 +18,7 @@ package vttablet
 
 import (
 	"fmt"
+	"path/filepath"
 
 	"vitess.io/vitess/go/vt/topo/topoproto"
 
@@ -97,9 +98,8 @@ func init() {
 
 	// Base mysqld_exporter flags.
 	mysqldExporterFlags.Add(func(s lazy.Spec) vitess.Flags {
-		spec := s.(*Spec)
 		return vitess.Flags{
-			"config.my-cnf": spec.myCnfFilePath(),
+			"config.my-cnf": filepath.Join(vtMycnfPath, mysqldExporterMySQLCnf),
 			// The default for `collect.info_schema.tables.databases` is `*`,
 			// which causes new time series to be created for each user table.
 			// This in turn causes scaling issues in Prometheus memory usage.

pkg/operator/vttablet/mysqlctld.go

@@ -40,7 +40,7 @@ ln -sf /dev/stderr /mnt/vt/config/stderr.symlink
 echo "log-error = /vt/config/stderr.symlink" > /mnt/vt/config/mycnf/log-error.cnf
 echo "binlog_format=row" > /mnt/vt/config/mycnf/rbr.cnf
 echo "socket = ` + mysqlSocketPath + `" > /mnt/vt/config/mycnf/socket.cnf
-echo -n "[client]\nuser=` + mysqldExporterUser + `\nsocket=` + mysqlSocketPath + `\n" > /mnt/vt/config/mycnf/` + mysqldExporterMySQLCnf + `
+echo -e "[client]\nuser=` + mysqldExporterUser + `\nsocket=` + mysqlSocketPath + `\n" > /mnt/vt/config/mycnf/` + mysqldExporterMySQLCnf + `
 `
 
 	mysqlSocketInitScript = `set -ex

pkg/operator/vttablet/pod.go

@@ -17,7 +17,6 @@ limitations under the License.
 package vttablet
 
 import (
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -211,9 +210,6 @@ func UpdatePod(obj *corev1.Pod, spec *Spec) {
 				key = strings.TrimLeft(key, "-")
 				mysqldExporterAllFlags[key] = value
 			}
-			if _, ok := mysqldExporterAllFlags["config.my-cnf"]; !ok {
-				mysqldExporterAllFlags["config.my-cnf"] = filepath.Join(vtMycnfPath, mysqldExporterMySQLCnf)
-			}
 		}
 
 		// TODO: Can/should we still run mysqld_exporter pointing at external mysql?

test/endtoend/operator/101_initial_cluster.yaml

@@ -22,7 +22,9 @@ spec:
     vtbackup: vitess/lite:v23.0.0-mysql80
     mysqld:
       mysql80Compatible: vitess/lite:v23.0.0-mysql80
-    mysqldExporter: prom/mysqld-exporter:v0.18.0
+    # This needs to stay at 0.14.0 until we're upgrading from v24 to v25.
+    # At which point it can use 0.18.0.
+    mysqldExporter: prom/mysqld-exporter:v0.14.0
   cells:
   - name: zone1
     gateway:

test/endtoend/utils.sh

@@ -521,7 +521,7 @@ function checkVitessBackupScheduleStatusWithTimeout() {
 function checkMysqldExporterMetrics() {
   for vttablet in $(kubectl get pods -n example --no-headers -o custom-columns=":metadata.name" | grep "vttablet") ; do
     echo "Confirming that the mysqld_exporter is working in ${vttablet}"
-    open_files=$(kubectl -n example exec -it "${vttablet}" -c vttablet -- curl localhost:9104/metrics | grep -E "^mysql_global_status_open_files" | awk '{print $2}' | bc)
+    open_files=$(kubectl -n example exec -it "${vttablet}" -c vttablet -- curl --max-time 10 localhost:9104/metrics | grep -E "^mysql_global_status_open_files" | awk '{print $2}' | bc)
     if [[ ${open_files} -lt 1 ]]; then
       echo -e "ERROR: mysqld metrics do not appear to be successfully exported from the ${vttablet} pod (open_files result: ${open_files})"
       exit 1