ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-25 12:59:06 +01:00
Code Issues Packages Releases Activity

Change import path

Browse Source
This commit is contained in:
Lou Knauer 2022-01-27 09:40:59 +01:00
parent 1c1b043246
commit 436eaf0a9d
23 changed files with 219 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
# executable: # executable:
cc-jobarchive cc-backend
/var/job-archive /var/job-archive
/var/*.db /var/*.db

13
README.md
View File

@ -1,6 +1,6 @@
# ClusterCockpit with a Golang backend # ClusterCockpit with a Golang backend
[![Build](https://github.com/ClusterCockpit/cc-jobarchive/actions/workflows/test.yml/badge.svg)](https://github.com/ClusterCockpit/cc-jobarchive/actions/workflows/test.yml) [![Build](https://github.com/ClusterCockpit/cc-backend/actions/workflows/test.yml/badge.svg)](https://github.com/ClusterCockpit/cc-backend/actions/workflows/test.yml)
Create your job-archive accoring to [this specification](https://github.com/ClusterCockpit/cc-specifications). At least one cluster with a valid `cluster.json` file is required. Having no jobs in the job-archive at all is fine. You may use the sample job-archive available for download [in cc-docker/develop](https://github.com/ClusterCockpit/cc-docker/tree/develop). Create your job-archive accoring to [this specification](https://github.com/ClusterCockpit/cc-specifications). At least one cluster with a valid `cluster.json` file is required. Having no jobs in the job-archive at all is fine. You may use the sample job-archive available for download [in cc-docker/develop](https://github.com/ClusterCockpit/cc-docker/tree/develop).
@ -8,10 +8,10 @@ Create your job-archive accoring to [this specification](https://github.com/Clus
```sh ```sh
# The frontend is a submodule, so use `--recursive` # The frontend is a submodule, so use `--recursive`
git clone --recursive git@github.com:ClusterCockpit/cc-jobarchive.git git clone --recursive git@github.com:ClusterCockpit/cc-backend.git
# Prepare frontend # Prepare frontend
cd ./cc-jobarchive/frontend cd ./cc-backend/frontend
yarn install yarn install
yarn build yarn build
@ -33,13 +33,13 @@ vim ./.env
# This will first initialize the job.db database by traversing all # This will first initialize the job.db database by traversing all
# `meta.json` files in the job-archive and add a new user. `--no-server` will cause the # `meta.json` files in the job-archive and add a new user. `--no-server` will cause the
# executable to stop once it has done that instead of starting a server. # executable to stop once it has done that instead of starting a server.
./cc-jobarchive --init-db --add-user <your-username>:admin:<your-password> --no-server ./cc-backend --init-db --add-user <your-username>:admin:<your-password> --no-server
# Start a HTTP server (HTTPS can be enabled, the default port is 8080): # Start a HTTP server (HTTPS can be enabled, the default port is 8080):
./cc-jobarchive ./cc-backend
# Show other options: # Show other options:
./cc-jobarchive --help ./cc-backend --help
``` ```
In order to run this program as a deamon, look at [utils/systemd/README.md](./utils/systemd/README.md) where a systemd unit file and more explanation is provided. In order to run this program as a deamon, look at [utils/systemd/README.md](./utils/systemd/README.md) where a systemd unit file and more explanation is provided.
@ -89,4 +89,3 @@ This project uses [gqlgen](https://github.com/99designs/gqlgen) for the GraphQL
- [ ] documentation, comments in the code base - [ ] documentation, comments in the code base
- [ ] write more TODOs - [ ] write more TODOs
- [ ] use more prepared statements and [sqrl](https://github.com/elgris/sqrl) instead of *squirrel* - [ ] use more prepared statements and [sqrl](https://github.com/elgris/sqrl) instead of *squirrel*
- [ ] replace `github.com/ClusterCockpit/cc-jobarchive` with `github.com/ClusterCockpit/cc-backend` in all import paths

12
api/rest.go
View File

@ -12,12 +12,12 @@ import (
"path/filepath" "path/filepath"
"sync" "sync"
"github.com/ClusterCockpit/cc-jobarchive/auth" "github.com/ClusterCockpit/cc-backend/auth"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/graph" "github.com/ClusterCockpit/cc-backend/graph"
"github.com/ClusterCockpit/cc-jobarchive/graph/model" "github.com/ClusterCockpit/cc-backend/graph/model"
"github.com/ClusterCockpit/cc-jobarchive/metricdata" "github.com/ClusterCockpit/cc-backend/metricdata"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"

10
api_test.go
View File

@ -14,11 +14,11 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/ClusterCockpit/cc-jobarchive/api" "github.com/ClusterCockpit/cc-backend/api"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/graph" "github.com/ClusterCockpit/cc-backend/graph"
"github.com/ClusterCockpit/cc-jobarchive/metricdata" "github.com/ClusterCockpit/cc-backend/metricdata"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
) )

2
auth/auth.go
View File

@ -14,7 +14,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/ClusterCockpit/cc-jobarchive/templates" "github.com/ClusterCockpit/cc-backend/templates"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"

4
config/config.go
View File

@ -10,8 +10,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/auth" "github.com/ClusterCockpit/cc-backend/auth"
"github.com/ClusterCockpit/cc-jobarchive/graph/model" "github.com/ClusterCockpit/cc-backend/graph/model"
"github.com/iamlouk/lrucache" "github.com/iamlouk/lrucache"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
) )

3
go.mod
View File

@ -1,4 +1,4 @@
module github.com/ClusterCockpit/cc-jobarchive module github.com/ClusterCockpit/cc-backend
go 1.15 go 1.15
@ -20,4 +20,3 @@ require (
gopkg.in/yaml.v2 v2.3.0 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect
) )
// replace github.com/iamlouk/lrucache => /home/lou/zeugs/go/lru-cache

24
gqlgen.yml
View File

@ -35,7 +35,7 @@ resolver:
# gqlgen will search for any type names in the schema in these go packages # gqlgen will search for any type names in the schema in these go packages
# if they match it will use them, otherwise it will generate them. # if they match it will use them, otherwise it will generate them.
autobind: autobind:
- "github.com/ClusterCockpit/cc-jobarchive/graph/model" - "github.com/ClusterCockpit/cc-backend/graph/model"
# This section declares type mapping between the GraphQL and go type systems # This section declares type mapping between the GraphQL and go type systems
# #
@ -55,19 +55,19 @@ models:
- github.com/99designs/gqlgen/graphql.Int64 - github.com/99designs/gqlgen/graphql.Int64
- github.com/99designs/gqlgen/graphql.Int32 - github.com/99designs/gqlgen/graphql.Int32
Job: Job:
model: "github.com/ClusterCockpit/cc-jobarchive/schema.Job" model: "github.com/ClusterCockpit/cc-backend/schema.Job"
fields: fields:
tags: tags:
resolver: true resolver: true
NullableFloat: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.Float" } NullableFloat: { model: "github.com/ClusterCockpit/cc-backend/schema.Float" }
MetricScope: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.MetricScope" } MetricScope: { model: "github.com/ClusterCockpit/cc-backend/schema.MetricScope" }
JobStatistics: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.JobStatistics" } JobStatistics: { model: "github.com/ClusterCockpit/cc-backend/schema.JobStatistics" }
Tag: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.Tag" } Tag: { model: "github.com/ClusterCockpit/cc-backend/schema.Tag" }
Resource: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.Resource" } Resource: { model: "github.com/ClusterCockpit/cc-backend/schema.Resource" }
JobState: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.JobState" } JobState: { model: "github.com/ClusterCockpit/cc-backend/schema.JobState" }
JobMetric: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.JobMetric" } JobMetric: { model: "github.com/ClusterCockpit/cc-backend/schema.JobMetric" }
Series: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.Series" } Series: { model: "github.com/ClusterCockpit/cc-backend/schema.Series" }
MetricStatistics: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.MetricStatistics" } MetricStatistics: { model: "github.com/ClusterCockpit/cc-backend/schema.MetricStatistics" }
StatsSeries: { model: "github.com/ClusterCockpit/cc-jobarchive/schema.StatsSeries" } StatsSeries: { model: "github.com/ClusterCockpit/cc-backend/schema.StatsSeries" }

294
graph/generated/generated.go
View File

File diff suppressed because it is too large Load Diff

2
graph/model/models_gen.go
View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
) )
type Accelerator struct { type Accelerator struct {

6
graph/resolver.go
View File

@ -8,9 +8,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/ClusterCockpit/cc-jobarchive/auth" "github.com/ClusterCockpit/cc-backend/auth"
"github.com/ClusterCockpit/cc-jobarchive/graph/model" "github.com/ClusterCockpit/cc-backend/graph/model"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
) )

12
graph/schema.resolvers.go
View File

@ -10,12 +10,12 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/auth" "github.com/ClusterCockpit/cc-backend/auth"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/graph/generated" "github.com/ClusterCockpit/cc-backend/graph/generated"
"github.com/ClusterCockpit/cc-jobarchive/graph/model" "github.com/ClusterCockpit/cc-backend/graph/model"
"github.com/ClusterCockpit/cc-jobarchive/metricdata" "github.com/ClusterCockpit/cc-backend/metricdata"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
) )

8
graph/stats.go
View File

@ -8,10 +8,10 @@ import (
"math" "math"
"github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/graph/model" "github.com/ClusterCockpit/cc-backend/graph/model"
"github.com/ClusterCockpit/cc-jobarchive/metricdata" "github.com/ClusterCockpit/cc-backend/metricdata"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
) )

2
init-db.go
View File

@ -9,7 +9,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
) )

4
metricdata/archive.go
View File

@ -13,8 +13,8 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
) )
// For a given job, return the path of the `data.json`/`meta.json` file. // For a given job, return the path of the `data.json`/`meta.json` file.

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

@ -9,8 +9,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
) )
type CCMetricStore struct { type CCMetricStore struct {

6
metricdata/influxdb-v2.go
View File

@ -10,9 +10,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/graph/model" "github.com/ClusterCockpit/cc-backend/graph/model"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxdb2 "github.com/influxdata/influxdb-client-go/v2"
influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api" influxdb2Api "github.com/influxdata/influxdb-client-go/v2/api"
) )

4
metricdata/metricdata.go
View File

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
"github.com/iamlouk/lrucache" "github.com/iamlouk/lrucache"
) )

2
metricdata/utils.go
View File

@ -3,7 +3,7 @@ package metricdata
import ( import (
"context" "context"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
) )
var TestLoadDataCallback func(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) = func(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) { var TestLoadDataCallback func(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) = func(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) {

16
server.go
View File

@ -24,14 +24,14 @@ import (
"github.com/99designs/gqlgen/graphql/handler" "github.com/99designs/gqlgen/graphql/handler"
"github.com/99designs/gqlgen/graphql/playground" "github.com/99designs/gqlgen/graphql/playground"
"github.com/ClusterCockpit/cc-jobarchive/api" "github.com/ClusterCockpit/cc-backend/api"
"github.com/ClusterCockpit/cc-jobarchive/auth" "github.com/ClusterCockpit/cc-backend/auth"
"github.com/ClusterCockpit/cc-jobarchive/config" "github.com/ClusterCockpit/cc-backend/config"
"github.com/ClusterCockpit/cc-jobarchive/graph" "github.com/ClusterCockpit/cc-backend/graph"
"github.com/ClusterCockpit/cc-jobarchive/graph/generated" "github.com/ClusterCockpit/cc-backend/graph/generated"
"github.com/ClusterCockpit/cc-jobarchive/metricdata" "github.com/ClusterCockpit/cc-backend/metricdata"
"github.com/ClusterCockpit/cc-jobarchive/schema" "github.com/ClusterCockpit/cc-backend/schema"
"github.com/ClusterCockpit/cc-jobarchive/templates" "github.com/ClusterCockpit/cc-backend/templates"
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"

2
utils/systemd/README.md
View File

@ -8,7 +8,7 @@ The `config.json` can have the optional fields *user* and *group*. If provided,
```sh ```sh
# 1.: Clone this repository to /var/clustercockpit # 1.: Clone this repository to /var/clustercockpit
git clone git@github.com:ClusterCockpit/cc-specifications.git /var/clustercockpit git clone git@github.com:ClusterCockpit/cc-backend.git /var/clustercockpit
# 2.: Install all dependencies and build everything # 2.: Install all dependencies and build everything
cd /var/clustercockpit cd /var/clustercockpit

3
utils/systemd/clustercockpit.service
View File

@ -3,6 +3,7 @@ Description=ClusterCockpit Web Server (Go edition)
Documentation=https://github.com/ClusterCockpit/cc-backend Documentation=https://github.com/ClusterCockpit/cc-backend
Wants=network-online.target Wants=network-online.target
After=network-online.target After=network-online.target
After=mariadb.service mysql.service
[Service] [Service]
WorkingDirectory=/var/clustercockpit WorkingDirectory=/var/clustercockpit
@ -10,7 +11,7 @@ Type=notify
NotifyAccess=all NotifyAccess=all
Restart=on-failure Restart=on-failure
TimeoutStopSec=100 TimeoutStopSec=100
ExecStart=/var/clustercockpit/cc-jobarchive --config ./config.json ExecStart=/var/clustercockpit/cc-backend --config ./config.json
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
utils/systemd/config.json
View File

@ -2,6 +2,8 @@
"addr": "0.0.0.0:443", "addr": "0.0.0.0:443",
"https-cert-file": "/etc/letsencrypt/live/<...>/fullchain.pem", "https-cert-file": "/etc/letsencrypt/live/<...>/fullchain.pem",
"https-key-file": "/etc/letsencrypt/live/<...>/privkey.pem", "https-key-file": "/etc/letsencrypt/live/<...>/privkey.pem",
"db-driver": "mysql",
"db": "clustercockpit:password@/cc_backend",
"user": "clustercockpit", "user": "clustercockpit",
"group": "clustercockpit" "group": "clustercockpit"
} }