Skip to content

Commit

Permalink
Add megahungry logs link
Browse files Browse the repository at this point in the history
  • Loading branch information
Fizzadar committed Aug 13, 2024
1 parent 1d20d7c commit 45e41fd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
21 changes: 17 additions & 4 deletions grafana.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@ type grafanaRequest struct {
Range grafanaRange `json:"range"`
}

func makeGrafanaLogsURL(username string) (string, error) {
func makeGrafanaLogURL(expr string) (string, error) {
now := time.Now().UTC()
from := now.Add(-time.Minute * 15)
to := now.Add(time.Minute * 15)

expr := `{username="` + username + `",env="prod"} | unpack`
req := grafanaRequest{
Datasource: "f21b0c24-8614-42eb-827b-fcbd230dd8d3",
Queries: []grafanaQuery{{expr, "range"}},
Expand All @@ -37,10 +36,24 @@ func makeGrafanaLogsURL(username string) (string, error) {
To: strconv.Itoa(int(to.UnixMilli())),
},
}

jsonStr, err := json.Marshal(req)
if err != nil {
return "", err
}
url := "https://grafana.beeper-tools.com/explore?orgId=1&left=" + url.QueryEscape(string(jsonStr))
return url, nil
return "https://grafana.beeper-tools.com/explore?orgId=1&left=" + url.QueryEscape(string(jsonStr)), nil
}

func makeGrafanaLogsURLs(username string) (string, string, error) {
bridgeLogsURL, err := makeGrafanaLogURL(`{username="` + username + `",env="prod"} | unpack`)
if err != nil {
return "", "", err
}

megahungryLogsURL, err := makeGrafanaLogURL(`{user_id="@` + username + `:beeper.com",env="prod"} | unpack`)
if err != nil {
return "", "", err
}

return bridgeLogsURL, megahungryLogsURL, nil
}
5 changes: 3 additions & 2 deletions submit.go
Original file line number Diff line number Diff line change
Expand Up @@ -1034,10 +1034,11 @@ func (s *submitServer) buildGenericIssueRequest(ctx context.Context, p parsedPay
fmt.Fprintf(bodyBuf, "\n### [Rageshake Logs](%s)", listingURL)
if isVerified {
fmt.Fprintf(bodyBuf, " | [User Admin](https://admin.beeper.com/user/%s)", username)
if userLogsURL, err := makeGrafanaLogsURL(username); err != nil {
if bridgeLogsURL, megahungryLogsURL, err := makeGrafanaLogsURLs(username); err != nil {
zerolog.Ctx(ctx).Err(err).Msg("Error generating grafana URL")
} else {
fmt.Fprintf(bodyBuf, " | [User Logs](%s)", userLogsURL)
fmt.Fprintf(bodyBuf, " | [Bridge Logs](%s)", bridgeLogsURL)
fmt.Fprintf(bodyBuf, " | [Megahungry Logs](%s)", megahungryLogsURL)
}
}

Expand Down

0 comments on commit 45e41fd

Please sign in to comment.