Commit b3373aa9 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

frontend exec page button updates + new metrics dashboard + meepctl grafana chart install

parent 616ec63b

.meepctl-repocfg.yaml

+3 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.3.0

version: 1.3.1

repo:

  name: AdvantEDGE

  core:
@@ -144,3 +144,5 @@ repo: 
    k8s:

      kube-state-metrics:

        chart: charts/kube-state-metrics

    grafana:

      chart: charts/grafana

charts/grafana/dashboards/custom-dashboard.json→charts/grafana/dashboards/metrics.json

100755 → 100644
+408 −215

File changed and moved.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

charts/grafana/values.yaml

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ datasources: 
      # access: proxy

      database: demo1

      # user: grafana

      url: http://10.3.16.78:30086

      url: "http://<CLUSTERIP>:30086"

      jsonData:

        timeInterval: "10s"

      # secureJsonData:
@@ -376,7 +376,7 @@ dashboardProviders: 
dashboards:

  default:

    custom-dashboard:

      file: dashboards/custom-dashboard.json

      file: dashboards/metrics.json

  #   some-dashboard:

  #     json: |

  #       $RAW_JSON

go-apps/meepctl/cmd/delete.go

+2 −1
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ func deleteDep(cobraCmd *cobra.Command) { 
	go k8sDelete("meep-kube-state-metrics", cobraCmd, messages)

	go k8sDelete("meep-metricbeat", cobraCmd, messages)

	go k8sDelete("meep-couchdb", cobraCmd, messages)

	go k8sDelete("meep-grafana", cobraCmd, messages)

	go k8sDelete("meep-influxdb", cobraCmd, messages)

	go k8sDelete("meep-kibana", cobraCmd, messages)

	go k8sDelete("meep-filebeat", cobraCmd, messages)
@@ -160,7 +161,7 @@ func deleteDep(cobraCmd *cobra.Command) { 


	// Wait for all pvc delete routines to complete

	// NOTE: Must be checked after deleting elastic

	for i := 0; i < 12; i++ {

	for i := 0; i < 14; i++ {

		fmt.Println(<-messages)

	}

go-apps/meepctl/cmd/deploy.go

+22 −9
Original line number Diff line number Diff line
@@ -146,7 +146,9 @@ func ensureCoreStorage(cobraCmd *cobra.Command) { 
}



func ensureDepStorage(cobraCmd *cobra.Command) {

	gitdir := viper.GetString("meep.gitdir") + "/"

	workdir := viper.GetString("meep.workdir") + "/"

	nodeIp := viper.GetString("node.ip")



	// Local storage structure

	cmd := exec.Command("mkdir", "-p", workdir)
@@ -155,6 +157,7 @@ func ensureDepStorage(cobraCmd *cobra.Command) { 
	cmd.Args = append(cmd.Args, workdir+"es-master-0")

	cmd.Args = append(cmd.Args, workdir+"es-master-1")

	cmd.Args = append(cmd.Args, workdir+"influxdb")

	cmd.Args = append(cmd.Args, workdir+"grafana")

	cmd.Args = append(cmd.Args, workdir+"kibana")

	cmd.Args = append(cmd.Args, workdir+"docker-registry")

	cmd.Args = append(cmd.Args, workdir+"certs")
@@ -165,22 +168,26 @@ func ensureDepStorage(cobraCmd *cobra.Command) { 
		fmt.Println(err)

	}



	//copy the yaml files in workdir and apply a modification to the tmp file, original is untouched

	// EXCEPTION #1: Update Cluster IP address in Grafana values.yaml

	cmd = exec.Command("mkdir", "-p", workdir+"tmp")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	pvES := viper.GetString("meep.gitdir") + "/" + utils.RepoCfg.GetString("repo.dep.elastic.es.pv")

	cmd = exec.Command("cp", pvES, workdir+"tmp/meep-pv-es.yaml")

	valuesGrafana := gitdir + utils.RepoCfg.GetString("repo.dep.grafana.chart") + "/values.yaml"

	cmd = exec.Command("cp", valuesGrafana, workdir+"tmp/grafana-values.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	str := "s/<CLUSTERIP>/" + nodeIp + "/g"

	cmd = exec.Command("sed", "-i", str, workdir+"tmp/grafana-values.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)



	// EXCEPTION #2: Update work directory in ES PV

	cmd = exec.Command("mkdir", "-p", workdir+"tmp")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	valuesFB := viper.GetString("meep.gitdir") + "/" + utils.RepoCfg.GetString("repo.dep.elastic.filebeat.values")

	cmd = exec.Command("cp", valuesFB, workdir+"tmp/filebeat-values.yaml")

	pvES := gitdir + utils.RepoCfg.GetString("repo.dep.elastic.es.pv")

	cmd = exec.Command("cp", pvES, workdir+"tmp/meep-pv-es.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	//search and replace in yaml file

	tmpStr := strings.Replace(workdir, "/", "\\/", -1)

	str := "s/<WORKDIR>/" + tmpStr + "/g"

	str = "s/<WORKDIR>/" + tmpStr + "/g"

	cmd = exec.Command("sed", "-i", str, workdir+"tmp/meep-pv-es.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	cmd = exec.Command("sed", "-i", str, workdir+"tmp/filebeat-values.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)



	// Local storage bindings

	// @TODO move to respective chart
@@ -294,6 +301,12 @@ func deployDep(cobraCmd *cobra.Command) { 
	flags = utils.HelmFlags(nil, "--set", "persistence.location="+workdir+"influxdb/")

	k8sDeploy(repo, chart, flags, cobraCmd)

	//---

	repo = "meep-grafana"

	chart = gitdir + utils.RepoCfg.GetString("repo.dep.grafana.chart")

	flags = utils.HelmFlags(nil, "--set", "persistentVolume.location="+workdir+"grafana/")

	flags = utils.HelmFlags(flags, "--values", workdir+"tmp/grafana-values.yaml")

	k8sDeploy(repo, chart, flags, cobraCmd)

	//---

	repo = "meep-kube-state-metrics"

	chart = gitdir + utils.RepoCfg.GetString("repo.dep.k8s.kube-state-metrics.chart")

	flags = nil