Skip to content

Commit

Permalink
feat: add version to /help (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
freak12techno authored Oct 21, 2023
1 parent 6446054 commit 0b7871f
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion cmd/grafana-interacter.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func Execute(configPath string) {
}

config := pkg.LoadConfig(configPath)
newApp := app.NewApp(config)
newApp := app.NewApp(config, version)
newApp.Start()
}

Expand Down
24 changes: 13 additions & 11 deletions pkg/app/app.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app

import (
"main/pkg/alertmanager"
"main/pkg/config"
"main/pkg/grafana"
"main/pkg/logger"
alertmanagerPkg "main/pkg/alertmanager"
configPkg "main/pkg/config"
grafanaPkg "main/pkg/grafana"
loggerPkg "main/pkg/logger"
"main/pkg/templates"
"strings"
"time"
Expand All @@ -17,18 +17,19 @@ import (
const MaxMessageSize = 4096

type App struct {
Config config.Config
Grafana *grafana.Grafana
Alertmanager *alertmanager.Alertmanager
Config configPkg.Config
Grafana *grafanaPkg.Grafana
Alertmanager *alertmanagerPkg.Alertmanager
TemplateManager *templates.TemplateManager
Logger *zerolog.Logger
Bot *tele.Bot
Version string
}

func NewApp(config *config.Config) *App {
logger := logger.GetLogger(config.Log)
grafana := grafana.InitGrafana(config.Grafana, logger)
alertmanager := alertmanager.InitAlertmanager(config.Alertmanager, logger)
func NewApp(config *configPkg.Config, version string) *App {
logger := loggerPkg.GetLogger(config.Log)
grafana := grafanaPkg.InitGrafana(config.Grafana, logger)
alertmanager := alertmanagerPkg.InitAlertmanager(config.Alertmanager, logger)
templateManager := templates.NewTemplateManager()

bot, err := tele.NewBot(tele.Settings{
Expand All @@ -53,6 +54,7 @@ func NewApp(config *config.Config) *App {
Alertmanager: alertmanager,
TemplateManager: templateManager,
Bot: bot,
Version: version,
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/app/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (a *App) HandleHelp(c tele.Context) error {
template, err := a.TemplateManager.Render("help", render.RenderStruct{
Grafana: a.Grafana,
Alertmanager: a.Alertmanager,
Data: nil,
Data: a.Version,
})
if err != nil {
a.Logger.Error().Err(err).Msg("Error rendering help template")
Expand Down
2 changes: 1 addition & 1 deletion templates/help.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<a href="https://github.com/freak12techno/grafana-interacter">grafana-interacter</a>
<a href="https://github.com/freak12techno/grafana-interacter">grafana-interacter</a> v{{ .Data }}
A Telegram bot that allows you to interact with your Grafana, Prometheus and Alertmanager instances.
Can understand the following commands:

Expand Down

0 comments on commit 0b7871f

Please sign in to comment.