Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

api: Expose mesh status #644

Merged
merged 2 commits into from
Mar 7, 2017
Merged

api: Expose mesh status #644

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc68fa9
api: Expose mesh status
mxinden Mar 7, 2017
d3a48d8
api: Replace LocalConnectionStatus with PeerStatus
mxinden Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/prometheus/alertmanager/silence"
"github.com/prometheus/alertmanager/silence/silencepb"
"github.com/prometheus/alertmanager/types"
"github.com/weaveworks/mesh"
)

var (
Expand Down Expand Up @@ -77,6 +78,7 @@ type API struct {
configJSON config.Config
resolveTimeout time.Duration
uptime time.Time
mrouter *mesh.Router

groups func() dispatch.AlertOverview

Expand All @@ -86,13 +88,14 @@ type API struct {
}

// New returns a new API.
func New(alerts provider.Alerts, silences *silence.Silences, gf func() dispatch.AlertOverview) *API {
func New(alerts provider.Alerts, silences *silence.Silences, gf func() dispatch.AlertOverview, router *mesh.Router) *API {
return &API{
context: route.Context,
alerts: alerts,
silences: silences,
groups: gf,
uptime: time.Now(),
mrouter: router,
}
}

Expand Down Expand Up @@ -165,10 +168,11 @@ func (api *API) status(w http.ResponseWriter, req *http.Request) {
api.mtx.RLock()

var status = struct {
Config string `json:"config"`
ConfigJSON config.Config `json:"configJSON"`
VersionInfo map[string]string `json:"versionInfo"`
Uptime time.Time `json:"uptime"`
Config string `json:"config"`
ConfigJSON config.Config `json:"configJSON"`
VersionInfo map[string]string `json:"versionInfo"`
Uptime time.Time `json:"uptime"`
MeshStatus strippedDownMeshStatus `json:"meshStatus"`
}{
Config: api.config,
ConfigJSON: api.configJSON,
Expand All @@ -180,14 +184,40 @@ func (api *API) status(w http.ResponseWriter, req *http.Request) {
"buildDate": version.BuildDate,
"goVersion": version.GoVersion,
},
Uptime: api.uptime,
Uptime: api.uptime,
MeshStatus: getStrippedDownMeshStatus(api),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove the getStrippedDown ... meshStatus is perfect :)

}

api.mtx.RUnlock()

respond(w, status)
}

type strippedDownMeshStatus struct {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here: strippedDown

Connections []strippedDownLocalConnectionStatus `json:"connections"`
}

type strippedDownLocalConnectionStatus struct {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here: strippedDown

Address string `json:"address"`
State string `json:"state"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe describe in a comment what Address and State will look like. While I can imagine that Address will be an IPv4 address, an IPv6 address or a hostname I have no idea what State could be (maybe "healthy"?).

}

func getStrippedDownMeshStatus(api *API) strippedDownMeshStatus {
status := mesh.NewStatus(api.mrouter)
strippedStatus := strippedDownMeshStatus{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically same here stripped, but I can see that that will cause collisions, generally speaking though you can keep the variable names much shorter. For example:

s := mesh.NewStatus(api.mrouter)
status := meshStatus{
...
}

Connections: make([]strippedDownLocalConnectionStatus, len(status.Connections)),
}

for i := 0; i < len(status.Connections); i++ {
strippedStatus.Connections[i] = strippedDownLocalConnectionStatus{
Address: status.Connections[i].Address,
State: status.Connections[i].State,
}
}

return strippedStatus
}

func (api *API) alertGroups(w http.ResponseWriter, req *http.Request) {
respond(w, api.groups())
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/alertmanager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func main() {

apiv := api.New(alerts, silences, func() dispatch.AlertOverview {
return disp.Groups()
})
}, mrouter)

amURL, err := extURL(*listenAddress, *externalURL)
if err != nil {
Expand Down