Merge pull request #144 from appuio/add/appcat_managed

Add AppCat queries for APPUiO Managed instances

README.md

@@ -107,7 +107,7 @@ See `docker-compose.yml` for the configuration.
 
 ```sh
 # Needs to be repeated after a Docker restart
-make docker-compose-up  
+make docker-compose-up
 
 # Next command asks for a password, it is "reporting"
 createdb --username=reporting -h localhost -p 5432 appuio-cloud-reporting-test

pkg/db/seeds.go

@@ -1,10 +1,8 @@
 package db
 
 import (
-	"bytes"
 	"database/sql"
 	"fmt"
-	"text/template"
 
 	_ "embed"
 
@@ -32,8 +30,7 @@ var appuioManagedOpenShiftvCPUQuery string
 //go:embed seeds/appuio_managed_kubernetes_vcpu.promql
 var appuioManagedKubernetesvCPUQuery string
 
-//go:embed seeds/appcat_vshn.promql.tmpl
-var appcatVSHNTemplate string
+var appcatQuery = "appcat:billing"
 
 // DefaultQueries consists of default starter queries.
 var DefaultQueries = []Query{
@@ -80,57 +77,28 @@ var DefaultQueries = []Query{
 		Query:       appuioManagedKubernetesvCPUQuery,
 		Unit:        "vCPU",
 	},
-}
-
-var renderedQueries = []RenderedQuery{
-	{
-		Query: Query{
-			Name:        "appcat_postgresql_by_vshn",
-			Description: "Number of VSHN managed postgres instances",
-			Unit:        "Instances",
-		},
-		ProductName: "appcat_postgres",
-		ServiceName: "appcat-postgresql",
-		Template:    appcatVSHNTemplate,
-	},
 	{
-		Query: Query{
-			Name:        "appcat_redis_by_vshn",
-			Description: "Number of VSHN managed redis instances",
-			Unit:        "Instances",
-		},
-		ProductName: "appcat_redis",
-		ServiceName: "appcat-redis",
-		Template:    appcatVSHNTemplate,
+		Name:        "appcat_services",
+		Description: "AppCat service instances query",
+		Query:       appcatQuery,
+		Unit:        "instances",
 	},
 }
 
-type RenderedQuery struct {
-	Query
-	ProductName string
-	ServiceName string
-	Template    string
-}
-
 // Seed seeds the database with "starter" data.
 // Is idempotent and thus can be executed multiple times in one database.
 func Seed(db *sql.DB) error {
-	return SeedQueries(db, DefaultQueries, renderedQueries)
+	return SeedQueries(db, DefaultQueries)
 }
 
-func SeedQueries(db *sql.DB, queries []Query, RenderedQueries []RenderedQuery) error {
+func SeedQueries(db *sql.DB, queries []Query) error {
 	dbx := NewDBx(db)
 	tx, err := dbx.Beginx()
 	if err != nil {
 		return err
 	}
 	defer tx.Rollback()
 
-	queries, err = addRenderedQueries(queries, RenderedQueries)
-	if err != nil {
-		return err
-	}
-
 	if err := createQueries(tx, queries); err != nil {
 		return err
 	}
@@ -183,25 +151,3 @@ func queryExistsByName(tx *sqlx.Tx, name string) (bool, error) {
 	err := tx.Get(&exists, "SELECT EXISTS(SELECT 1 FROM queries WHERE name = $1)", name)
 	return exists, err
 }
-
-func addRenderedQueries(queries []Query, renderenderedQueries []RenderedQuery) ([]Query, error) {
-	for _, query := range renderenderedQueries {
-		rendered, err := renderQuery(query)
-		if err != nil {
-			return nil, err
-		}
-		query.Query.Query = rendered
-		queries = append(queries, query.Query)
-	}
-	return queries, nil
-}
-
-func renderQuery(query RenderedQuery) (string, error) {
-	tmpl, err := template.New("AppCatService").Parse(query.Template)
-	if err != nil {
-		return "", err
-	}
-	buffer := &bytes.Buffer{}
-	err = tmpl.Execute(buffer, query)
-	return buffer.String(), err
-}

pkg/db/seeds_test.go

@@ -22,7 +22,7 @@ func (s *SeedsTestSuite) TestSeedDefaultQueries() {
 	_, err := d.Exec("DELETE FROM queries")
 	require.NoError(t, err)
 
-	expQueryNum := 9
+	expQueryNum := 8
 
 	count := "SELECT COUNT(*) FROM queries"
 	requireQueryEqual(t, d, 0, count)
@@ -33,7 +33,7 @@ func (s *SeedsTestSuite) TestSeedDefaultQueries() {
 			Description: "Memory usage (maximum of requested and used memory) aggregated by namespace",
 			Unit:        "MiB",
 		},
-	}, []db.RenderedQuery{}))
+	}))
 	t.Log(t, count)
 	requireQueryEqual(t, d, 1, count)
 

pkg/report/report.go

@@ -80,6 +80,7 @@ func runQuery(ctx context.Context, tx *sqlx.Tx, prom PromQuerier, query db.Query
 		defer cancel()
 		promQCtx = ctx
 	}
+
 	// The data in the database is from T to T+1h. Prometheus queries backwards from T to T-1h.
 	res, _, err := prom.Query(promQCtx, query.Query, from.Add(time.Hour))
 	if err != nil {