mirror of
https://github.com/prometheus/prometheus.git
synced 2025-01-12 22:37:27 -08:00
Ship assets in compiled binary.
- utility/embed-static.sh, get called in Makefile to create go map from files - web/blob/blob.go implements http Handle for serving the files from the map - web/status.go uses blog.GetFile() to get the template file The assets are gzipped and decompressed on demand.
This commit is contained in:
parent
2192b52064
commit
fc16580b4c
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -20,3 +20,4 @@
|
||||||
[568a].out
|
[568a].out
|
||||||
_cgo_*
|
_cgo_*
|
||||||
core
|
core
|
||||||
|
web/blob/files.go
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -19,11 +19,13 @@ test: build
|
||||||
go test ./...
|
go test ./...
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
./utility/embed-static.sh web/static web/templates > web/blob/files.go
|
||||||
$(MAKE) -C model
|
$(MAKE) -C model
|
||||||
go build ./...
|
go build ./...
|
||||||
go build -o prometheus.build
|
go build -o prometheus.build
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
rm -rf web/static/blob/files.go
|
||||||
rm -rf $(TEST_ARTIFACTS)
|
rm -rf $(TEST_ARTIFACTS)
|
||||||
$(MAKE) -C model clean
|
$(MAKE) -C model clean
|
||||||
-find . -type f -iname '*~' -exec rm '{}' ';'
|
-find . -type f -iname '*~' -exec rm '{}' ';'
|
||||||
|
|
38
utility/embed-static.sh
Executable file
38
utility/embed-static.sh
Executable file
|
@ -0,0 +1,38 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
cat <<EOF
|
||||||
|
package blob
|
||||||
|
var files = map [string] map [string] []byte {
|
||||||
|
EOF
|
||||||
|
|
||||||
|
type_file=`tempfile`
|
||||||
|
cat <<EOF > $type_file
|
||||||
|
var types = map [string] map [string] string {
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
for dir in $@
|
||||||
|
do
|
||||||
|
pushd "$dir" > /dev/null
|
||||||
|
echo -e "\t\"`basename $dir`\": {"
|
||||||
|
echo -e "\t\"`basename $dir`\": {" >> $type_file
|
||||||
|
|
||||||
|
find -type f | while read file
|
||||||
|
do
|
||||||
|
mime=`mimetype -b "$file"`
|
||||||
|
name=`echo "$file"|sed 's|\.\/||'`
|
||||||
|
echo -e "\t\t\"$name\": \"$mime\"," >> $type_file
|
||||||
|
|
||||||
|
echo -e "\t\t\"$name\": {"
|
||||||
|
gzip -9 -c "$file" | xxd -p |sed 's/\(..\)/0x\1, /g'
|
||||||
|
echo -e "\t\t},"
|
||||||
|
echo
|
||||||
|
done
|
||||||
|
echo -e "\t}," >> $type_file
|
||||||
|
echo -e "\t},"
|
||||||
|
popd > /dev/null
|
||||||
|
done
|
||||||
|
echo '}'
|
||||||
|
cat $type_file
|
||||||
|
echo '}'
|
||||||
|
rm $type_file
|
43
web/blob/blob.go
Normal file
43
web/blob/blob.go
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
package blob
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func GetFile(bucket string, name string) ([]byte, error) {
|
||||||
|
reader := bytes.NewReader(files[bucket][name])
|
||||||
|
gz, err := gzip.NewReader(reader)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var b bytes.Buffer
|
||||||
|
io.Copy(&b, gz)
|
||||||
|
gz.Close()
|
||||||
|
|
||||||
|
return b.Bytes(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type Handler struct{}
|
||||||
|
|
||||||
|
func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
|
name := r.URL.String()
|
||||||
|
if name == "" {
|
||||||
|
name = "index.html"
|
||||||
|
}
|
||||||
|
|
||||||
|
file, err := GetFile("static", name)
|
||||||
|
if err != nil {
|
||||||
|
if err != io.EOF {
|
||||||
|
log.Printf("Could not get file: %s", err)
|
||||||
|
}
|
||||||
|
w.WriteHeader(http.StatusNotFound)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", types["static"][name])
|
||||||
|
w.Write(file)
|
||||||
|
}
|
|
@ -16,7 +16,9 @@ package web
|
||||||
import (
|
import (
|
||||||
"github.com/prometheus/prometheus/appstate"
|
"github.com/prometheus/prometheus/appstate"
|
||||||
"github.com/prometheus/prometheus/retrieval"
|
"github.com/prometheus/prometheus/retrieval"
|
||||||
|
"github.com/prometheus/prometheus/web/blob"
|
||||||
"html/template"
|
"html/template"
|
||||||
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -38,6 +40,11 @@ func (h *StatusHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
Status: "TODO: add status information here",
|
Status: "TODO: add status information here",
|
||||||
TargetPools: h.appState.TargetManager.Pools(),
|
TargetPools: h.appState.TargetManager.Pools(),
|
||||||
}
|
}
|
||||||
t, _ := template.ParseFiles("web/templates/status.html")
|
template_file, err := blob.GetFile("templates", "status.html")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Could not read template: %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
t, _ := template.New("status").Parse(string(template_file))
|
||||||
t.Execute(w, status)
|
t.Execute(w, status)
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ import (
|
||||||
"github.com/prometheus/client_golang"
|
"github.com/prometheus/client_golang"
|
||||||
"github.com/prometheus/prometheus/appstate"
|
"github.com/prometheus/prometheus/appstate"
|
||||||
"github.com/prometheus/prometheus/web/api"
|
"github.com/prometheus/prometheus/web/api"
|
||||||
|
"github.com/prometheus/prometheus/web/blob"
|
||||||
"net/http"
|
"net/http"
|
||||||
_ "net/http/pprof"
|
_ "net/http/pprof"
|
||||||
)
|
)
|
||||||
|
@ -35,7 +36,7 @@ func StartServing(appState *appstate.ApplicationState) {
|
||||||
http.Handle("/status", &StatusHandler{appState: appState})
|
http.Handle("/status", &StatusHandler{appState: appState})
|
||||||
http.Handle("/api/", gorest.Handle())
|
http.Handle("/api/", gorest.Handle())
|
||||||
http.Handle("/metrics.json", exporter)
|
http.Handle("/metrics.json", exporter)
|
||||||
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("web/static"))))
|
http.Handle("/static/", http.StripPrefix("/static/", new(blob.Handler)))
|
||||||
|
|
||||||
go http.ListenAndServe(*listenAddress, nil)
|
go http.ListenAndServe(*listenAddress, nil)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue