f-39: api: /register et /ping, mesure périodique de l'état de l'hôte #39
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
080ce82d0d
commit
9a1e941b15
13 changed files with 537 additions and 8 deletions
|
|
@ -27,7 +27,7 @@ func newTestServerWith(t *testing.T, cfg *configuration.Config) (*Server, *badge
|
|||
q := worker.New(100)
|
||||
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
|
||||
d := dispatcher.New(q, db, cfg, logger)
|
||||
return New(d, db, logger, "127.0.0.1:0"), db
|
||||
return New(d, db, logger, "127.0.0.1:0", &fakeHost{}), db
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
|
|
|||
56
internal/api/agent/host.go
Normal file
56
internal/api/agent/host.go
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
package agentapi
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
|
||||
"git.g3e.fr/syonad/two/internal/host"
|
||||
)
|
||||
|
||||
type HostInfo interface {
|
||||
Register() (host.Facts, error)
|
||||
Ping() (host.Ping, bool)
|
||||
}
|
||||
|
||||
func (s *Server) RegisterHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, `{"error":"method not allowed"}`, http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
f, err := s.host.Register()
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusServiceUnavailable)
|
||||
json.NewEncoder(w).Encode(ErrorResponse{Error: "host facts unavailable: " + err.Error()})
|
||||
return
|
||||
}
|
||||
json.NewEncoder(w).Encode(HostRegister{
|
||||
Hostname: f.Hostname,
|
||||
CPU: HostCPU{Vendor: f.CPU.Vendor, Model: f.CPU.Model, Sockets: f.CPU.Sockets, Cores: f.CPU.Cores, Threads: f.CPU.Threads},
|
||||
MemoryBytes: f.MemoryBytes,
|
||||
OS: HostOS{ID: f.OS.ID, VersionID: f.OS.VersionID, PrettyName: f.OS.PrettyName},
|
||||
Kernel: f.Kernel,
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Server) PingHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, `{"error":"method not allowed"}`, http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
p, ok := s.host.Ping()
|
||||
if !ok {
|
||||
w.WriteHeader(http.StatusServiceUnavailable)
|
||||
json.NewEncoder(w).Encode(ErrorResponse{Error: "no host state collected yet"})
|
||||
return
|
||||
}
|
||||
json.NewEncoder(w).Encode(HostPing{
|
||||
AgentVersion: p.AgentVersion,
|
||||
CollectedAt: p.CollectedAt,
|
||||
BootTime: p.BootTime,
|
||||
AgentStartTime: p.AgentStartTime,
|
||||
UptimeSeconds: p.UptimeSeconds,
|
||||
Load: p.Load,
|
||||
})
|
||||
}
|
||||
103
internal/api/agent/host_test.go
Normal file
103
internal/api/agent/host_test.go
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
package agentapi
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.g3e.fr/syonad/two/internal/host"
|
||||
)
|
||||
|
||||
type fakeHost struct {
|
||||
facts host.Facts
|
||||
factsErr error
|
||||
ping *host.Ping
|
||||
}
|
||||
|
||||
func (f *fakeHost) Register() (host.Facts, error) { return f.facts, f.factsErr }
|
||||
|
||||
func (f *fakeHost) Ping() (host.Ping, bool) {
|
||||
if f.ping == nil {
|
||||
return host.Ping{}, false
|
||||
}
|
||||
return *f.ping, true
|
||||
}
|
||||
|
||||
func serveHost(t *testing.T, h *fakeHost, method, path string) *httptest.ResponseRecorder {
|
||||
t.Helper()
|
||||
s, _ := newTestServer(t)
|
||||
s.host = h
|
||||
w := httptest.NewRecorder()
|
||||
s.srv.Handler.ServeHTTP(w, httptest.NewRequest(method, path, nil))
|
||||
return w
|
||||
}
|
||||
|
||||
func TestRegister_ServesTheFacts(t *testing.T) {
|
||||
h := &fakeHost{facts: host.Facts{
|
||||
Hostname: "hv1",
|
||||
CPU: host.CPU{Vendor: "AuthenticAMD", Model: "AMD EPYC 7272 12-Core Processor", Sockets: 1, Cores: 12, Threads: 24},
|
||||
MemoryBytes: 134217728000,
|
||||
OS: host.OS{ID: "debian", VersionID: "12", PrettyName: "Debian GNU/Linux 12 (bookworm)"},
|
||||
Kernel: "6.1.0-26-amd64",
|
||||
}}
|
||||
w := serveHost(t, h, http.MethodGet, "/register")
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("attendu 200, obtenu %d : %s", w.Code, w.Body.String())
|
||||
}
|
||||
want := `{"hostname":"hv1","cpu":{"vendor":"AuthenticAMD","model":"AMD EPYC 7272 12-Core Processor","sockets":1,"cores":12,"threads":24},"memory_bytes":134217728000,"os":{"id":"debian","version_id":"12","pretty_name":"Debian GNU/Linux 12 (bookworm)"},"kernel":"6.1.0-26-amd64"}`
|
||||
if got := strings.TrimSpace(w.Body.String()); got != want {
|
||||
t.Errorf("corps :\n%s\nattendu :\n%s", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRegister_UnavailableFacts(t *testing.T) {
|
||||
w := serveHost(t, &fakeHost{factsErr: errors.New("open proc/cpuinfo: file does not exist")}, http.MethodGet, "/register")
|
||||
if w.Code != http.StatusServiceUnavailable {
|
||||
t.Fatalf("attendu 503, obtenu %d", w.Code)
|
||||
}
|
||||
var e ErrorResponse
|
||||
if err := json.NewDecoder(w.Body).Decode(&e); err != nil || e.Error != "host facts unavailable: open proc/cpuinfo: file does not exist" {
|
||||
t.Errorf("erreur %q, %v", e.Error, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPing_ServesTheLastState(t *testing.T) {
|
||||
h := &fakeHost{ping: &host.Ping{
|
||||
State: host.State{BootTime: 1793499123, UptimeSeconds: 21730.4, Load: [3]float64{0.12, 0.3, 0.25}},
|
||||
AgentVersion: "0.3.0",
|
||||
AgentStartTime: 1793499190,
|
||||
CollectedAt: 1793520853,
|
||||
}}
|
||||
w := serveHost(t, h, http.MethodGet, "/ping")
|
||||
if w.Code != http.StatusOK {
|
||||
t.Fatalf("attendu 200, obtenu %d : %s", w.Code, w.Body.String())
|
||||
}
|
||||
want := `{"agent_version":"0.3.0","collected_at":1793520853,"boot_time":1793499123,"agent_start_time":1793499190,"uptime_seconds":21730.4,"load":[0.12,0.3,0.25]}`
|
||||
if got := strings.TrimSpace(w.Body.String()); got != want {
|
||||
t.Errorf("corps :\n%s\nattendu :\n%s", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPing_BeforeTheFirstCollection(t *testing.T) {
|
||||
w := serveHost(t, &fakeHost{}, http.MethodGet, "/ping")
|
||||
if w.Code != http.StatusServiceUnavailable {
|
||||
t.Fatalf("attendu 503, obtenu %d", w.Code)
|
||||
}
|
||||
if !strings.Contains(w.Body.String(), "no host state collected yet") {
|
||||
t.Errorf("corps %s", w.Body.String())
|
||||
}
|
||||
}
|
||||
|
||||
func TestHostRoutes_ReadOnly(t *testing.T) {
|
||||
h := &fakeHost{ping: &host.Ping{}}
|
||||
for _, path := range []string{"/register", "/ping"} {
|
||||
for _, method := range []string{http.MethodPost, http.MethodPut, http.MethodDelete} {
|
||||
if w := serveHost(t, h, method, path); w.Code != http.StatusMethodNotAllowed {
|
||||
t.Errorf("%s %s : attendu 405, obtenu %d", method, path, w.Code)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -123,3 +123,34 @@ type FloatingIP struct {
|
|||
IP string `json:"ip,omitempty"`
|
||||
Gateway string `json:"gateway,omitempty"`
|
||||
}
|
||||
|
||||
type HostCPU struct {
|
||||
Vendor string `json:"vendor"`
|
||||
Model string `json:"model"`
|
||||
Sockets int `json:"sockets"`
|
||||
Cores int `json:"cores"`
|
||||
Threads int `json:"threads"`
|
||||
}
|
||||
|
||||
type HostOS struct {
|
||||
ID string `json:"id"`
|
||||
VersionID string `json:"version_id"`
|
||||
PrettyName string `json:"pretty_name"`
|
||||
}
|
||||
|
||||
type HostRegister struct {
|
||||
Hostname string `json:"hostname"`
|
||||
CPU HostCPU `json:"cpu"`
|
||||
MemoryBytes uint64 `json:"memory_bytes"`
|
||||
OS HostOS `json:"os"`
|
||||
Kernel string `json:"kernel"`
|
||||
}
|
||||
|
||||
type HostPing struct {
|
||||
AgentVersion string `json:"agent_version"`
|
||||
CollectedAt int64 `json:"collected_at"`
|
||||
BootTime int64 `json:"boot_time"`
|
||||
AgentStartTime int64 `json:"agent_start_time"`
|
||||
UptimeSeconds float64 `json:"uptime_seconds"`
|
||||
Load [3]float64 `json:"load"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,11 +17,12 @@ type Server struct {
|
|||
dispatcher *dispatcher.Dispatcher
|
||||
db *badger.DB
|
||||
logger *slog.Logger
|
||||
host HostInfo
|
||||
srv *http.Server
|
||||
}
|
||||
|
||||
func New(d *dispatcher.Dispatcher, db *badger.DB, logger *slog.Logger, address string) *Server {
|
||||
s := &Server{dispatcher: d, db: db, logger: logger}
|
||||
func New(d *dispatcher.Dispatcher, db *badger.DB, logger *slog.Logger, address string, h HostInfo) *Server {
|
||||
s := &Server{dispatcher: d, db: db, logger: logger, host: h}
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("/vpcs", s.VpcsHandler)
|
||||
mux.HandleFunc("/vpcs/", s.VpcByNameHandler)
|
||||
|
|
@ -33,6 +34,8 @@ func New(d *dispatcher.Dispatcher, db *badger.DB, logger *slog.Logger, address s
|
|||
mux.HandleFunc("/nat-gateways/", s.NATGatewayByNameHandler)
|
||||
mux.HandleFunc("/floating-ips", s.FloatingIPsHandler)
|
||||
mux.HandleFunc("/floating-ips/", s.FloatingIPByNameHandler)
|
||||
mux.HandleFunc("/register", s.RegisterHandler)
|
||||
mux.HandleFunc("/ping", s.PingHandler)
|
||||
s.srv = &http.Server{Addr: address, Handler: s.logMiddleware(mux)}
|
||||
return s
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue