Remove loglevel notice

cmd/cc-backend/main.go

@@ -75,7 +75,7 @@ func main() {
 	flag.StringVar(&flagDelUser, "del-user", "", "Remove user by `username`")
 	flag.StringVar(&flagGenJWT, "jwt", "", "Generate and print a JWT for the user specified by its `username`")
 	flag.StringVar(&flagImportJob, "import-job", "", "Import a job. Argument format: `<path-to-meta.json>:<path-to-data.json>,...`")
-	flag.StringVar(&flagLogLevel, "loglevel", "debug", "Sets the logging level: `[debug (default),info,notice,warn,err,fatal,crit]`")
+	flag.StringVar(&flagLogLevel, "loglevel", "debug", "Sets the logging level: `[debug (default),info,warn,err,fatal,crit]`")
 	flag.Parse()
 
 	if flagVersion {

internal/auth/ldap.go

@@ -44,7 +44,7 @@ func (la *LdapAuthenticator) Init(
 		}
 
 		if interval == 0 {
-			log.Note("Sync interval is zero")
+			log.Info("Sync interval is zero")
 			return nil
 		}
 

internal/metricdata/cc-metric-store.go

@@ -16,8 +16,8 @@ import (
 	"time"
 
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 )
 
 type CCMetricStoreConfig struct {
@@ -283,7 +283,7 @@ func (ccms *CCMetricStore) buildQueries(
 		mc := archive.GetMetricConfig(job.Cluster, metric)
 		if mc == nil {
 			// return nil, fmt.Errorf("METRICDATA/CCMS > metric '%s' is not specified for cluster '%s'", metric, job.Cluster)
-			log.Notef("metric '%s' is not specified for cluster '%s'", metric, job.Cluster)
+			log.Infof("metric '%s' is not specified for cluster '%s'", metric, job.Cluster)
 			continue
 		}
 

internal/metricdata/influxdb-v2.go

@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api"
 )
@@ -98,10 +98,10 @@ func (idb *InfluxDBv2DataRepository) LoadData(
 				idb.formatTime(job.StartTime), idb.formatTime(idb.epochToTime(job.StartTimeUnix+int64(job.Duration)+int64(1))),
 				measurementsCond, hostsCond)
 		case "socket":
-			log.Note("Scope 'socket' requested, but not yet supported: Will return 'node' scope only. ")
+			log.Info("Scope 'socket' requested, but not yet supported: Will return 'node' scope only. ")
 			continue
 		case "core":
-			log.Note(" Scope 'core' requested, but not yet supported: Will return 'node' scope only. ")
+			log.Info(" Scope 'core' requested, but not yet supported: Will return 'node' scope only. ")
 			continue
 			// Get Finest Granularity only, Set NULL to 0.0
 			// query = fmt.Sprintf(`
@@ -115,7 +115,7 @@ func (idb *InfluxDBv2DataRepository) LoadData(
 			//  	idb.formatTime(job.StartTime), idb.formatTime(idb.epochToTime(job.StartTimeUnix + int64(job.Duration) + int64(1) )),
 			//  	measurementsCond, hostsCond)
 		default:
-			log.Notef("Unknown scope '%s' requested: Will return 'node' scope.", scope)
+			log.Infof("Unknown scope '%s' requested: Will return 'node' scope.", scope)
 			continue
 			// return nil, errors.New("METRICDATA/INFLUXV2 > the InfluxDB metric data repository does not yet support other scopes than 'node'")
 		}
@@ -194,7 +194,7 @@ func (idb *InfluxDBv2DataRepository) LoadData(
 			// 		hostSeries.Data = append(hostSeries.Data, schema.Float(val))
 			// }
 		default:
-			log.Notef("Unknown scope '%s' requested: Will return 'node' scope.", scope)
+			log.Infof("Unknown scope '%s' requested: Will return 'node' scope.", scope)
 			continue
 			// return nil, errors.New("the InfluxDB metric data repository does not yet support other scopes than 'node, core'")
 		}
@@ -324,7 +324,7 @@ func (idb *InfluxDBv2DataRepository) LoadNodeData(
 	ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
 
 	// TODO : Implement to be used in Analysis- und System/Node-View
-	log.Notef("LoadNodeData unimplemented for InfluxDBv2DataRepository, Args: cluster %s, metrics %v, nodes %v, scopes %v", cluster, metrics, nodes, scopes)
+	log.Infof("LoadNodeData unimplemented for InfluxDBv2DataRepository, Args: cluster %s, metrics %v, nodes %v, scopes %v", cluster, metrics, nodes, scopes)
 
 	return nil, errors.New("METRICDATA/INFLUXV2 > unimplemented for InfluxDBv2DataRepository")
 }

internal/metricdata/prometheus.go

@@ -5,24 +5,24 @@
 package metricdata
 
 import (
-	"os"
+	"bytes"
-	"errors"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
-	"strings"
-	"text/template"
-	"bytes"
-	"net/http"
-	"time"
 	"math"
-	"sort"
+	"net/http"
+	"os"
 	"regexp"
+	"sort"
+	"strings"
 	"sync"
+	"text/template"
+	"time"
 
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	"github.com/ClusterCockpit/cc-backend/pkg/schema"
 	promapi "github.com/prometheus/client_golang/api"
 	promv1 "github.com/prometheus/client_golang/api/prometheus/v1"
 	promcfg "github.com/prometheus/common/config"
@@ -60,7 +60,6 @@ func contains(s []schema.MetricScope, str schema.MetricScope) bool {
 	return false
 }
 
-
 func MinMaxMean(data []schema.Float) (float64, float64, float64) {
 	if len(data) == 0 {
 		return 0.0, 0.0, 0.0
@@ -75,13 +74,16 @@ func MinMaxMean(data []schema.Float) (float64, float64, float64) {
 		}
 		sum += float64(val)
 		n += 1
-		if float64(val) > max {max = float64(val)}
+		if float64(val) > max {
-		if float64(val) < min {min = float64(val)}
+			max = float64(val)
+		}
+		if float64(val) < min {
+			min = float64(val)
+		}
 	}
 	return min, max, sum / n
 }
 
-
 // Rewritten from
 // https://github.com/ermanh/trieregex/blob/master/trieregex/trieregex.py
 func nodeRegex(nodes []string) string {
@@ -90,7 +92,9 @@ func nodeRegex(nodes []string) string {
 	for _, node := range nodes {
 		_trie := root
 		for _, c := range node {
-      if _, ok := _trie[c]; !ok {_trie[c] = Trie{}}
+			if _, ok := _trie[c]; !ok {
+				_trie[c] = Trie{}
+			}
 			_trie = _trie[c]
 		}
 		_trie['*'] = Trie{}
@@ -106,7 +110,9 @@ func nodeRegex(nodes []string) string {
 		}
 		if len(trie) == 1 {
 			for key, _trie := range trie {
-        if key == '*' { return "" }
+				if key == '*' {
+					return ""
+				}
 				return regexp.QuoteMeta(string(key)) + trieRegex(_trie, false)
 			}
 		} else {
@@ -139,7 +145,9 @@ func nodeRegex(nodes []string) string {
 			} else {
 				result = "(?:" + strings.Join(sequences, "|") + ")"
 			}
-      if _, ok := trie['*']; ok { result += "?"}
+			if _, ok := trie['*']; ok {
+				result += "?"
+			}
 			return result
 		}
 		return ""
@@ -147,9 +155,6 @@ func nodeRegex(nodes []string) string {
 	return trieRegex(root, true)
 }
 
-
-
-
 func (pdb *PrometheusDataRepository) Init(rawConfig json.RawMessage) error {
 	var config PrometheusDataRepositoryConfig
 	// parse config
@@ -194,9 +199,6 @@ func (pdb *PrometheusDataRepository) Init(rawConfig json.RawMessage) error {
 	return nil
 }
 
-
-
-
 // TODO: respect scope argument
 func (pdb *PrometheusDataRepository) FormatQuery(
 	metric string,
@@ -226,15 +228,12 @@ func (pdb *PrometheusDataRepository) FormatQuery(
 	}
 }
 
-
-
-
 // Convert PromAPI row to CC schema.Series
 func (pdb *PrometheusDataRepository) RowToSeries(
 	from time.Time,
 	step int64,
 	steps int64,
-		row *promm.SampleStream) (schema.Series) {
+	row *promm.SampleStream) schema.Series {
 	ts := from.Unix()
 	hostname := strings.TrimSuffix(string(row.Metric["exported_instance"]), pdb.suffix)
 	// init array of expected length with NaN
@@ -260,9 +259,6 @@ func (pdb *PrometheusDataRepository) RowToSeries(
 	}
 }
 
-
-
-
 func (pdb *PrometheusDataRepository) LoadData(
 	job *schema.Job,
 	metrics []string,
@@ -285,7 +281,9 @@ func (pdb *PrometheusDataRepository) LoadData(
 
 	for _, scope := range scopes {
 		if scope != schema.MetricScopeNode {
-			logOnce.Do(func(){log.Notef("Scope '%s' requested, but not yet supported: Will return 'node' scope only.", scope)})
+			logOnce.Do(func() {
+				log.Infof("Scope '%s' requested, but not yet supported: Will return 'node' scope only.", scope)
+			})
 			continue
 		}
 
@@ -347,9 +345,6 @@ func (pdb *PrometheusDataRepository) LoadData(
 	return jobData, nil
 }
 
-
-
-
 // TODO change implementation to precomputed/cached stats
 func (pdb *PrometheusDataRepository) LoadStats(
 	job *schema.Job,
@@ -374,9 +369,6 @@ func (pdb *PrometheusDataRepository) LoadStats(
 	return stats, nil
 }
 
-
-
-
 func (pdb *PrometheusDataRepository) LoadNodeData(
 	cluster string,
 	metrics, nodes []string,
@@ -393,7 +385,9 @@ func (pdb *PrometheusDataRepository) LoadNodeData(
 	}
 	for _, scope := range scopes {
 		if scope != schema.MetricScopeNode {
-			logOnce.Do(func(){log.Notef("Note: Scope '%s' requested, but not yet supported: Will return 'node' scope only.", scope)})
+			logOnce.Do(func() {
+				log.Infof("Note: Scope '%s' requested, but not yet supported: Will return 'node' scope only.", scope)
+			})
 			continue
 		}
 		for _, metric := range metrics {

internal/repository/job.go

@@ -339,7 +339,7 @@ func (r *JobRepository) CountGroupedJobs(ctx context.Context, aggreg model.Aggre
 			count = fmt.Sprintf(`sum(job.num_nodes * (CASE WHEN job.job_state = "running" THEN %d - job.start_time ELSE job.duration END)) as count`, now)
 			runner = r.DB
 		default:
-			log.Notef("CountGroupedJobs() Weight %v unknown.", *weight)
+			log.Infof("CountGroupedJobs() Weight %v unknown.", *weight)
 		}
 	}
 
@@ -407,7 +407,7 @@ func (r *JobRepository) MarkArchived(
 		case "file_bw":
 			stmt = stmt.Set("file_bw_avg", stats.Avg)
 		default:
-			log.Notef("MarkArchived() Metric '%v' unknown", metric)
+			log.Infof("MarkArchived() Metric '%v' unknown", metric)
 		}
 	}
 
@@ -633,7 +633,7 @@ func (r *JobRepository) StopJobsExceedingWalltimeBy(seconds int) error {
 	}
 
 	if rowsAffected > 0 {
-		log.Notef("%d jobs have been marked as failed due to running too long", rowsAffected)
+		log.Infof("%d jobs have been marked as failed due to running too long", rowsAffected)
 	}
 	return nil
 }
@@ -652,6 +652,7 @@ var groupBy2column = map[model.Aggregate]string{
 func (r *JobRepository) JobsStatistics(ctx context.Context,
 	filter []*model.JobFilter,
 	groupBy *model.Aggregate) ([]*model.JobsStatistics, error) {
+	start := time.Now()
 
 	// In case `groupBy` is nil (not used), the model.JobsStatistics used is at the key '' (empty string)
 	stats := map[string]*model.JobsStatistics{}
@@ -793,6 +794,7 @@ func (r *JobRepository) JobsStatistics(ctx context.Context,
 		}
 	}
 
+	log.Infof("Timer %s", time.Since(start))
 	return res, nil
 }
 

pkg/log/log.go

@@ -19,7 +19,6 @@ import (
 
 var (
 	DebugWriter io.Writer = os.Stderr
-	NoteWriter  io.Writer = os.Stderr
 	InfoWriter  io.Writer = os.Stderr
 	WarnWriter  io.Writer = os.Stderr
 	ErrWriter   io.Writer = os.Stderr
@@ -29,19 +28,17 @@ var (
 var (
 	DebugPrefix string = "<7>[DEBUG]    "
 	InfoPrefix  string = "<6>[INFO]     "
-	NotePrefix  string = "<5>[NOTICE]   "
 	WarnPrefix  string = "<4>[WARNING]  "
 	ErrPrefix   string = "<3>[ERROR]    "
 	CritPrefix  string = "<2>[CRITICAL] "
 )
 
 var (
-	DebugLog *log.Logger = log.New(DebugWriter, DebugPrefix, 0)
+	DebugLog *log.Logger
-	InfoLog  *log.Logger = log.New(InfoWriter, InfoPrefix, 0)
+	InfoLog  *log.Logger
-	NoteLog  *log.Logger = log.New(NoteWriter, NotePrefix, log.Lshortfile)
+	WarnLog  *log.Logger
-	WarnLog  *log.Logger = log.New(WarnWriter, WarnPrefix, log.Lshortfile)
+	ErrLog   *log.Logger
-	ErrLog   *log.Logger = log.New(ErrWriter, ErrPrefix, log.Llongfile)
+	CritLog  *log.Logger
-	CritLog  *log.Logger = log.New(CritWriter, CritPrefix, log.Llongfile)
 )
 
 /* CONFIG */
@@ -57,9 +54,6 @@ func Init(lvl string, logdate bool) {
 	case "warn":
 		InfoWriter = io.Discard
 		fallthrough
-	case "notice":
-		NoteWriter = io.Discard
-		fallthrough
 	case "info":
 		DebugWriter = io.Discard
 	case "debug":
@@ -72,15 +66,13 @@ func Init(lvl string, logdate bool) {
 
 	if !logdate {
 		DebugLog = log.New(DebugWriter, DebugPrefix, 0)
-		InfoLog = log.New(InfoWriter, InfoPrefix, 0)
+		InfoLog = log.New(InfoWriter, InfoPrefix, log.Lshortfile)
-		NoteLog = log.New(NoteWriter, NotePrefix, log.Lshortfile)
 		WarnLog = log.New(WarnWriter, WarnPrefix, log.Lshortfile)
 		ErrLog = log.New(ErrWriter, ErrPrefix, log.Llongfile)
 		CritLog = log.New(CritWriter, CritPrefix, log.Llongfile)
 	} else {
 		DebugLog = log.New(DebugWriter, DebugPrefix, log.LstdFlags)
-		InfoLog = log.New(InfoWriter, InfoPrefix, log.LstdFlags)
+		InfoLog = log.New(InfoWriter, InfoPrefix, log.LstdFlags|log.Lshortfile)
-		NoteLog = log.New(NoteWriter, NotePrefix, log.LstdFlags|log.Lshortfile)
 		WarnLog = log.New(WarnWriter, WarnPrefix, log.LstdFlags|log.Lshortfile)
 		ErrLog = log.New(ErrWriter, ErrPrefix, log.LstdFlags|log.Llongfile)
 		CritLog = log.New(CritWriter, CritPrefix, log.LstdFlags|log.Llongfile)
@@ -108,10 +100,6 @@ func Info(v ...interface{}) {
 	InfoLog.Output(2, printStr(v...))
 }
 
-func Note(v ...interface{}) {
-	NoteLog.Output(2, printStr(v...))
-}
-
 func Warn(v ...interface{}) {
 	WarnLog.Output(2, printStr(v...))
 }
@@ -157,10 +145,6 @@ func Infof(format string, v ...interface{}) {
 	InfoLog.Output(2, printfStr(format, v...))
 }
 
-func Notef(format string, v ...interface{}) {
-	NoteLog.Output(2, printfStr(format, v...))
-}
-
 func Warnf(format string, v ...interface{}) {
 	WarnLog.Output(2, printfStr(format, v...))
 }