ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-11-10 08:57:25 +01:00
Code Issues Packages Releases Activity

use token from cluster.json

Browse Source
This commit is contained in:
Lou Knauer 2021-12-20 10:49:46 +01:00
parent a6e8d5b484
commit 30a436e27e
4 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.env
View File

@ -1,11 +1,4 @@
export CCMETRICSTORE_URL="http://localhost:8081"
export CCMETRICSTORE_JWT="eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJ1c2VyIjoiYWRtaW4iLCJyb2xlcyI6WyJST0xFX0FETUlOIiwiUk9MRV9BTkFMWVNUIiwiUk9MRV9VU0VSIl19.d-3_3FZTsadPjDEdsWrrQ7nS0edMAR4zjl-eK7rJU3HziNBfI9PDHDIpJVHTNN5E5SlLGLFXctWyKAkwhXL-Dw"
export INFLUXDB_V2_TOKEN="egLfcf7fx0FESqFYU3RpAAbj"
export JWT_PUBLIC_KEY="kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0=" export JWT_PUBLIC_KEY="kzfYrYy+TzpanWZHJ5qSdMj5uKUWgq74BWhQG6copP0="
export JWT_PRIVATE_KEY="dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q==" export JWT_PRIVATE_KEY="dtPC/6dWJFKZK7KZ78CvWuynylOmjBFyMsUWArwmodOTN9itjL5POlqdZkcnmpJ0yPm4pRaCrvgFaFAbpyik/Q=="
export SESSION_KEY="67d829bf61dc5f87a73fd814e2c9f629" export SESSION_KEY="67d829bf61dc5f87a73fd814e2c9f629"
export LDAP_ADMIN_PASSWORD="mashup" export LDAP_ADMIN_PASSWORD="mashup"

12
metricdata/cc-metric-store.go
View File

@ -6,9 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"log"
"net/http" "net/http"
"os"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-jobarchive/config"
@ -46,13 +44,9 @@ type ApiStatsData struct {
Max schema.Float `json:"max"` Max schema.Float `json:"max"`
} }
func (ccms *CCMetricStore) Init(url string) error { func (ccms *CCMetricStore) Init(url, token string) error {
ccms.url = url // os.Getenv("CCMETRICSTORE_URL") ccms.url = url
ccms.jwt = os.Getenv("CCMETRICSTORE_JWT") ccms.jwt = token
if ccms.jwt == "" {
log.Println("warning: environment variable 'CCMETRICSTORE_JWT' not set")
}
return nil return nil
} }

4
metricdata/metricdata.go
View File

@ -11,7 +11,7 @@ import (
type MetricDataRepository interface { type MetricDataRepository interface {
// Initialize this MetricDataRepository. One instance of // Initialize this MetricDataRepository. One instance of
// this interface will only ever be responsible for one cluster. // this interface will only ever be responsible for one cluster.
Init(url string) error Init(url, token string) error
// Return the JobData for the given job, only with the requested metrics. // Return the JobData for the given job, only with the requested metrics.
LoadData(job *schema.Job, metrics []string, ctx context.Context) (schema.JobData, error) LoadData(job *schema.Job, metrics []string, ctx context.Context) (schema.JobData, error)
@ -37,7 +37,7 @@ func Init(jobArchivePath string, disableArchive bool) error {
switch cluster.MetricDataRepository.Kind { switch cluster.MetricDataRepository.Kind {
case "cc-metric-store": case "cc-metric-store":
ccms := &CCMetricStore{} ccms := &CCMetricStore{}
if err := ccms.Init(cluster.MetricDataRepository.Url); err != nil { if err := ccms.Init(cluster.MetricDataRepository.Url, cluster.MetricDataRepository.Token); err != nil {
return err return err
} }
metricDataRepos[cluster.Name] = ccms metricDataRepos[cluster.Name] = ccms

14
server.go
View File

@ -16,6 +16,7 @@ import (
"github.com/ClusterCockpit/cc-jobarchive/graph" "github.com/ClusterCockpit/cc-jobarchive/graph"
"github.com/ClusterCockpit/cc-jobarchive/graph/generated" "github.com/ClusterCockpit/cc-jobarchive/graph/generated"
"github.com/ClusterCockpit/cc-jobarchive/metricdata" "github.com/ClusterCockpit/cc-jobarchive/metricdata"
"github.com/ClusterCockpit/cc-jobarchive/schema"
"github.com/ClusterCockpit/cc-jobarchive/templates" "github.com/ClusterCockpit/cc-jobarchive/templates"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
@ -264,19 +265,16 @@ func monitoringRoutes(router *mux.Router, resolver *graph.Resolver) {
filterPresets := map[string]interface{}{} filterPresets := map[string]interface{}{}
query := r.URL.Query() query := r.URL.Query()
if query.Get("tag") != "" { if query.Get("tag") != "" {
filterPresets["tagId"] = query.Get("tag") filterPresets["tag"] = query.Get("tag")
} }
if query.Get("cluster") != "" { if query.Get("cluster") != "" {
filterPresets["clusterId"] = query.Get("cluster") filterPresets["cluster"] = query.Get("cluster")
} }
if query.Get("project") != "" { if query.Get("project") != "" {
filterPresets["projectId"] = query.Get("project") filterPresets["project"] = query.Get("project")
} }
if query.Get("running") == "true" { if query.Get("state") != "" && schema.JobState(query.Get("state")).Valid() {
filterPresets["isRunning"] = true filterPresets["state"] = query.Get("state")
}
if query.Get("running") == "false" {
filterPresets["isRunning"] = false
} }
if query.Get("from") != "" && query.Get("to") != "" { if query.Get("from") != "" && query.Get("to") != "" {
filterPresets["startTime"] = map[string]string{ filterPresets["startTime"] = map[string]string{