Merge pull request #3 from flant/link2kibana

uzhinskiy · web-flow · commit 9d4b00333658 · 2023-02-22T22:52:15.000+03:00
Добавил ссылку на отдельную кибану
diff --git a/examples/main.yml b/examples/main.yml
@@ -2,12 +2,14 @@ app:
   port: 9400
   bind: 0.0.0.0
   timeout: 60
+  kibana: http://kibana.host
 elastic:
-  host: http://elasticsearch:9200/
+  host: https://localhost:9200/
 # use this fields if elastic requires BA
-#  username: elastic
-#  password: elastic
+  username: admin
+  password: admin
   ssl: false
+  insecure: true
 # Видим-ли в списке снапшотов системые (.kibana* / .opendistro* )
 # значение по умолчанию = false, то-есть не видим
   include_system: false
diff --git a/front/index.html b/front/index.html
@@ -3,6 +3,7 @@
 <head>
 <title>Elasticsearch: restore snapshots</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
 <link rel="stylesheet" href="/assets/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous"> 
 <style>
 body {
@@ -130,6 +131,8 @@ <h5 class="modal-title" id="exampleModalLabel">X-tract indices from snapshot</h5
 
 <script>
 
+var kibana_url = "{{.}}"
+
 var getnodes = setInterval(NodeStatus, 5000);
 var getindices = setInterval(IndexList, 3000);
 
@@ -187,7 +190,7 @@ <h5 class="modal-title" id="exampleModalLabel">X-tract indices from snapshot</h5
 
           basket = '<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-folder2-open ' + done + '" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M1 3.5A1.5 1.5 0 0 1 2.5 2h2.764c.958 0 1.76.56 2.311 1.184C7.985 3.648 8.48 4 9 4h4.5A1.5 1.5 0 0 1 15 5.5v.64c.57.265.94.876.856 1.546l-.64 5.124A2.5 2.5 0 0 1 12.733 15H3.266a2.5 2.5 0 0 1-2.481-2.19l-.64-5.124A1.5 1.5 0 0 1 1 6.14V3.5zM2 6h12v-.5a.5.5 0 0 0-.5-.5H9c-.964 0-1.71-.629-2.174-1.154C6.374 3.334 5.82 3 5.264 3H2.5a.5.5 0 0 0-.5.5V6zm-.367 1a.5.5 0 0 0-.496.562l.64 5.124A1.5 1.5 0 0 0 3.266 14h9.468a1.5 1.5 0 0 0 1.489-1.314l.64-5.124A.5.5 0 0 0 14.367 7H1.633z"/></svg>';
           
-          str += "<li>"+ basket + "&nbsp;" + k + "<span class='float-right'>" + bytesToSize(ts) + "&nbsp;&nbsp;" + del_button+ "</span>";
+          str += "<li><a href='" + kibana_url + "' target=_blank>" + basket + "</a>&nbsp;" + k + "<span class='float-right'>" + bytesToSize(ts) + "&nbsp;&nbsp;" + del_button+ "</span>";
           str += "<div class='progress'  style='height: 3px;'>";
           str += "<div class='progress-bar " + pc + "' role='progressbar' style='width: " + prc + "%;' aria-valuenow='" + prc + "' aria-valuemin='0' aria-valuemax='100'></div>";
           str += "</div><br></li>";
diff --git a/modules/config/config.go b/modules/config/config.go
@@ -24,6 +24,7 @@ type Config struct {
 	App struct {
 		Port       string `yaml:"port"`
 		Bind       string `yaml:"bind"`
+		Kibana     string `yaml:"kibana"`
 		TimeOut    int    `yaml:"-"`
 		TimeOutRaw *int   `yaml:"timeout"`
 	} `yaml:"app"`
diff --git a/modules/router/router.go b/modules/router/router.go
@@ -23,6 +23,7 @@ import (
 	"regexp"
 	"sort"
 	"strings"
+	"text/template"
 
 	"time"
 
@@ -147,7 +148,12 @@ func (rt *Router) FrontHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", contentType)
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	w.Header().Set("X-Server", version.Version)
-	w.Write(data)
+	if strings.Contains(file, ".html") {
+		t := template.Must(template.New("index").Parse(string(data)))
+		t.Execute(w, rt.conf.App.Kibana)
+	} else {
+		w.Write(data)
+	}
 }
 
 func (rt *Router) ApiHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/modules/router/tls.go b/modules/router/tls.go
@@ -42,6 +42,7 @@ func createTLSConfig(pemFile, pemCertFile, pemPrivateKeyFile string, insecureSki
 		}
 		tlsConfig.Certificates = []tls.Certificate{certs}
 	}
+
 	return &tlsConfig
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ func createTLSConfig(pemFile, pemCertFile, pemPrivateKeyFile string, insecureSki`
`42`	`42`	`}`
`43`	`43`	`tlsConfig.Certificates = []tls.Certificate{certs}`
`44`	`44`	`}`
	`45`	`+`
`45`	`46`	`return &tlsConfig`
`46`	`47`	`}`
`47`	`48`