Monitoring homepage updates, help and favico

This commit is contained in:
Derek Collison
2016-01-09 07:57:58 -08:00
parent 270bda9a88
commit 1e37a6b23c
4 changed files with 71 additions and 44 deletions

View File

@@ -18,6 +18,9 @@
- [ ] Info updates contain other implicit route servers - [ ] Info updates contain other implicit route servers
- [ ] Multi-tenant accounts with isolation of subject space - [ ] Multi-tenant accounts with isolation of subject space
- [ ] Add to varz, time for slow consumers, peek or total connections, memory, etc. - [ ] Add to varz, time for slow consumers, peek or total connections, memory, etc.
- [ ] Add starttime and uptime to connz list.
- [ ] Add in HTTP requests to varz?
- [ ] Add favico and help link for monitoring?
- [X] Better user/pass support using bcrypt etc. - [X] Better user/pass support using bcrypt etc.
- [X] SSL/TLS support - [X] SSL/TLS support
- [X] Add support for / to point to varz, connz, etc.. - [X] Add support for / to point to varz, connz, etc..

View File

@@ -1,38 +1,52 @@
2015 iMac 5k 4Ghz i7
MacOSX 10.11.2
====================
Go version go1.5.2
====================
PASS
Benchmark_GoMap___GetSmallKey-8 300000000 5.06 ns/op 197.63 mops/s
Benchmark_HashMap_GetSmallKey-8 100000000 10.6 ns/op 94.34 mops/s
Benchmark_GoMap____GetMedKey-8 300000000 5.09 ns/op 196.46 mops/s
Benchmark_HashMap__GetMedKey-8 200000000 6.75ns/op 148.15 mops/s
Benchmark_GoMap____GetLrgKey-8 300000000 4.88ns/op 204.91 mops/s
Benchmark_HashMap__GetLrgKey-8 100000000 17.8 ns/op 56.18 mops/s
Benchmark_GoMap_________Set-8 50000000 26.3 ns/op 38.02 mops/s
Benchmark_HashMap_______Set-8 20000000 82.4 ns/op 12.13 mops/s
2013 MacbookAir 11" i7 1.7Ghz Haswell 2013 MacbookAir 11" i7 1.7Ghz Haswell
Linux mint15 3.8.0-19 Linux mint15 3.8.0-19
================ ====================
Go version go1.2.1 Go version go1.2.1
================ ====================
Benchmark_GoMap___GetSmallKey 500000000 7.57 ns/op 132.05 mops/s Benchmark_GoMap___GetSmallKey 500000000 7.57 ns/op 132.05 mops/s
Benchmark_HashMap_GetSmallKey 100000000 14.30 ns/op 70.08 mops/s Benchmark_HashMap_GetSmallKey 100000000 14.30 ns/op 70.08 mops/s
Benchmark_GoMap____GetMedKey 500000000 4.83 ns/op 207.01 mops/s Benchmark_GoMap____GetMedKey 500000000 4.83 ns/op 207.01 mops/s
Benchmark_HashMap__GetMedKey 200000000 9.54 ns/op 104.82 mops/s Benchmark_HashMap__GetMedKey 200000000 9.54 ns/op 104.82 mops/s
Benchmark_GoMap____GetLrgKey 500000000 4.39 ns/op 227.79 mops/s Benchmark_GoMap____GetLrgKey 500000000 4.39 ns/op 227.79 mops/s
Benchmark_HashMap__GetLrgKey 100000000 24.50 ns/op 40.77 mops/s Benchmark_HashMap__GetLrgKey 100000000 24.50 ns/op 40.77 mops/s
================ ====================
Go version go1.2.1 Go version go1.2.1
================ ====================
Benchmark_GoMap___GetSmallKey 200000000 8.77 ns/op 114.02 mops/s Benchmark_GoMap___GetSmallKey 200000000 8.77 ns/op 114.02 mops/s
Benchmark_HashMap_GetSmallKey 100000000 14.80 ns/op 67.53 mops/s Benchmark_HashMap_GetSmallKey 100000000 14.80 ns/op 67.53 mops/s
Benchmark_GoMap____GetMedKey 500000000 6.21 ns/op 161.05 mops/s Benchmark_GoMap____GetMedKey 500000000 6.21 ns/op 161.05 mops/s
Benchmark_HashMap__GetMedKey 200000000 9.51 ns/op 105.15 mops/s Benchmark_HashMap__GetMedKey 200000000 9.51 ns/op 105.15 mops/s
Benchmark_GoMap____GetLrgKey 100000000 18.30 ns/op 54.68 mops/s Benchmark_GoMap____GetLrgKey 100000000 18.30 ns/op 54.68 mops/s
Benchmark_HashMap__GetLrgKey 100000000 24.80 ns/op 40.36 mops/s Benchmark_HashMap__GetLrgKey 100000000 24.80 ns/op 40.36 mops/s
================ ====================
Go version go1.0.3 Go version go1.0.3
================ ====================
Benchmark_GoMap___GetSmallKey 50000000 52.20 ns/op 19.17 mops/s
Benchmark_HashMap_GetSmallKey 100000000 15.50 ns/op 64.34 mops/s
Benchmark_GoMap____GetMedKey 50000000 61.60 ns/op 16.24 mops/s
Benchmark_HashMap__GetMedKey 200000000 8.91 ns/op 112.20 mops/s
Benchmark_GoMap____GetLrgKey 20000000 86.90 ns/op 11.51 mops/s
Benchmark_HashMap__GetLrgKey 100000000 25.40 ns/op 39.44 mops/s
Benchmark_GoMap___GetSmallKey 50000000 52.20 ns/op 19.17 mops/s
Benchmark_HashMap_GetSmallKey 100000000 15.50 ns/op 64.34 mops/s
Benchmark_GoMap____GetMedKey 50000000 61.60 ns/op 16.24 mops/s
Benchmark_HashMap__GetMedKey 200000000 8.91 ns/op 112.20 mops/s
Benchmark_GoMap____GetLrgKey 20000000 86.90 ns/op 11.51 mops/s
Benchmark_HashMap__GetLrgKey 100000000 25.40 ns/op 39.44 mops/s

View File

@@ -309,23 +309,7 @@ func myUptime(d time.Duration) string {
// HandleRoot will show basic info and links to others handlers. // HandleRoot will show basic info and links to others handlers.
func (s *Server) HandleRoot(w http.ResponseWriter, r *http.Request) { func (s *Server) HandleRoot(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, `<html lang="en"> fmt.Fprintf(w, rootHTML)
<head>
<style type="text/css">
body { font-family: “Century Gothic”, CenturyGothic, AppleGothic, sans-serif; font-size: 18; }
a { margin-left: 32px; }
</style>
</head>
<body>
<img src="http://nats.io/img/logo.png" alt="NATS">
<br/>
<a href=/varz>varz</a><br/>
<a href=/connz>connz</a><br/>
<a href=/routez>routez</a><br/>
<a href=/subsz>subsz</a><br/>
</body>
</html>
`)
} }
// HandleVarz will process HTTP requests for server information. // HandleVarz will process HTTP requests for server information.

26
server/roothtml.go Normal file
View File

@@ -0,0 +1,26 @@
// Copyright 2016 Apcera Inc. All rights reserved.
package server
// Holds the root HTML for our monitoring home page.
var rootHTML = "" +
`<html lang="en">
<head>
<link href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+xY1CPsWNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+xY1lPsWN/D7FjccAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+xY2MPsWN/z7Fjf8+xY3HAAAAAAAAAAAAAAAAAAAAAAAAAAA+xY3nPsWN5z7Fjec+xY3nPsWN5z7Fjec+xY3nPsWN/z7Fjf8+xY3/PsWN/z7Fjec+xY3nPsWN5z7Fjec+xY3nPsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/4vcuv/1/Pn/ld/A/z7Fjf8+xY3/PsWN/z7Fjf9KyZP/9fz5//X8+f/1/Pn/ctSr/z7Fjf8+xY3/PsWN/z7Fjf+V38D//////5/ixv8+xY3/PsWN/z7Fjf9Wy5n//////////////////////3nWr/8+xY3/PsWN/z7Fjf8+xY3/ld/A//////+f4sb/PsWN/z7Fjf9o0KP///////////+X3r//yO3d//////951q//PsWN/z7Fjf8+xY3/PsWN/5XfwP//////n+LG/z7Fjf991q////////////9/1rD/PsWN/8jt3f//////edav/z7Fjf8+xY3/PsWN/z7Fjf+V38D//////5/ixv+V3b3///////////9p0aT/PsWN/z7Fjf/I7d3//////3nWr/8+xY3/PsWN/z7Fjf8+xY3/ld/A//////////////////////9Wy5n/PsWN/z7Fjf8+xY3/yO3d//////951q//PsWN/z7Fjf8+xY3/PsWN/5XfwP////////////////9KyZP/PsWN/z7Fjf8+xY3/PsWN/8jt3f//////edav/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3/PsWN/z7Fjf8+xY3//98AAP+fAAD+HwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" rel="icon" type="image/x-icon"/>
<style type="text/css">
body { font-family: “Century Gothic”, CenturyGothic, AppleGothic, sans-serif; font-size: 22; }
a { margin-left: 32px; }
</style>
</head>
<body>
<img src="http://nats.io/img/logo.png" alt="NATS">
<br/>
<a href=/varz>varz</a><br/>
<a href=/connz>connz</a><br/>
<a href=/routez>routez</a><br/>
<a href=/subsz>subsz</a><br/>
<br/>
<a href=http://nats.io/documentation/server/gnatsd-monitoring/>help</a>
</body>
</html>
`