Skip to content

Commit

Permalink
Merge pull request #93 from openflighthpc/chore/repo-paths
Browse files Browse the repository at this point in the history
Update repo paths
  • Loading branch information
timalces committed May 13, 2024
2 parents 2b95609 + 742d355 commit 6370676
Show file tree
Hide file tree
Showing 28 changed files with 51 additions and 51 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The metrics and the associated views are made available over a HTTP API.

1. Clone the repository
```bash
git clone https://github.com/alces-flight/concertim-metric-reporting-daemon.git
git clone https://github.com/openflighthpc/concertim-metric-reporting-daemon.git
```
2. Build the docker image
```bash
Expand All @@ -29,9 +29,9 @@ The metrics and the associated views are made available over a HTTP API.
```

Use [Concertim OpenStack
Service](https://github.com/alces-flight/concertim-openstack-service) to
Service](https://github.com/openflighthpc/concertim-openstack-service) to
collect and report metrics and use [Concertim Visualisation
App](https://github.com/alces-flight/concertim-ct-visualisation-app) to view
App](https://github.com/openflighthpc/concertim-ct-visualisation-app) to view
the reported metrics.

## Building the docker image
Expand All @@ -41,7 +41,7 @@ There is a Dockerfile in this repo for building the image.

1. Clone the repository
```bash
git clone https://github.com/alces-flight/concertim-metric-reporting-daemon.git
git clone https://github.com/openflighthpc/concertim-metric-reporting-daemon.git
```
2. Build the docker image
```bash
Expand Down Expand Up @@ -119,7 +119,7 @@ getting started with development.

Concertim Metric Reporting Daemon is deployed as part of the Concertim
appliance using the [Concertim ansible
playbook](https://github.com/alces-flight/concertim-ansible-playbook).
playbook](https://github.com/openflighthpc/concertim-ansible-playbook).

# Contributing

Expand Down
2 changes: 1 addition & 1 deletion api/converters.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ package api
import (
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
)

Expand Down
2 changes: 1 addition & 1 deletion api/getCurrentHostMetrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"errors"
"net/http"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
)

// getCurrentHostMetrics returns a JSON list of all current metrics for the
Expand Down
2 changes: 1 addition & 1 deletion api/getHistoricHostMetricNames.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"errors"
"net/http"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
)

// getHistoricHostMetricNames returns a JSON list of historic metric names. The
Expand Down
2 changes: 1 addition & 1 deletion api/getHistoricHostMetricValues.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"errors"
"net/http"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
)

// getHistoricHostMetricValues returns a JSON list of historic metric values
Expand Down
6 changes: 3 additions & 3 deletions api/getHistoricMetricNames_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"net/http/httptest"
"testing"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/alces-flight/concertim-metric-reporting-daemon/rrd"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/rrd"
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion api/getHistoricMetricValues.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"math"
"net/http"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
)

type historicHostResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion api/getMetricValues.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"net/http"
"strconv"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
)

type metricValue struct {
Expand Down
2 changes: 1 addition & 1 deletion api/getUniqueMetrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"errors"
"net/http"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
)

type uniqueMetric struct {
Expand Down
4 changes: 2 additions & 2 deletions api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ import (
"net/http"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"github.com/go-chi/jwtauth/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
"github.com/rs/zerolog/hlog"
)
Expand Down
4 changes: 2 additions & 2 deletions api/testutils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"strings"
"testing"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion api/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ import (
"strings"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-playground/locales/en"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
"github.com/go-playground/validator/v10/non-standard/validators"
en_translations "github.com/go-playground/validator/v10/translations/en"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog/hlog"
)

Expand Down
4 changes: 2 additions & 2 deletions canned/retrievers.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"os"
"strings"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/alces-flight/concertim-metric-reporting-daemon/visualizer"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/visualizer"
"github.com/pkg/errors"
"github.com/rs/zerolog"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/create-auth-token/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"os"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/go-chi/jwtauth/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
)

var configFile = flag.String("config-file", config.DefaultPath, "path to config file")
Expand Down
16 changes: 8 additions & 8 deletions cmd/reporting/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ import (
"github.com/rs/zerolog/log"
"golang.org/x/sys/unix"

"github.com/alces-flight/concertim-metric-reporting-daemon/api"
"github.com/alces-flight/concertim-metric-reporting-daemon/canned"
"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/alces-flight/concertim-metric-reporting-daemon/dsmRepository"
"github.com/alces-flight/concertim-metric-reporting-daemon/inmem"
"github.com/alces-flight/concertim-metric-reporting-daemon/rrd"
"github.com/alces-flight/concertim-metric-reporting-daemon/visualizer"
"github.com/openflighthpc/concertim-metric-reporting-daemon/api"
"github.com/openflighthpc/concertim-metric-reporting-daemon/canned"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/dsmRepository"
"github.com/openflighthpc/concertim-metric-reporting-daemon/inmem"
"github.com/openflighthpc/concertim-metric-reporting-daemon/rrd"
"github.com/openflighthpc/concertim-metric-reporting-daemon/visualizer"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/routes/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import (
"runtime"
"strings"

"github.com/alces-flight/concertim-metric-reporting-daemon/api"
"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/chi/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/api"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog/log"
)

Expand Down
2 changes: 1 addition & 1 deletion docs/examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

These example scripts demonstrate usage of the metric reporting API. Example
scripts for the rack and device API can be found at
https://github.com/alces-flight/concertim-ct-visualisation-app/tree/main/docs/api/examples
https://github.com/openflighthpc/concertim-ct-visualisation-app/tree/main/docs/api/examples

For the best experience you will want to ensure that you are viewing the
example scripts for the same release as the Concertim instance.
Expand Down
2 changes: 1 addition & 1 deletion docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ at some points between the start and end times the value will be returned as

Requests requiring authentication should set the `Authorization` header using the `Bearer` authentication strategy. The token should be a JWT token, which can be created as described below.

When deployed as part of the Concertim appliance, an API token can be created by using the ct-visualisation-app [get-auth-token.sh example script](https://github.com/alces-flight/concertim-ct-visualisation-app/blob/main/docs/api/examples/get-auth-token.sh), which will print the auth token to standard output.
When deployed as part of the Concertim appliance, an API token can be created by using the ct-visualisation-app [get-auth-token.sh example script](https://github.com/openflighthpc/concertim-ct-visualisation-app/blob/main/docs/api/examples/get-auth-token.sh), which will print the auth token to standard output.

When running locally, an API token can be created by running, `go run cmd/create-auth-token/main.go`. The auth token will be printed to standard output.

Expand Down
4 changes: 2 additions & 2 deletions dsmRepository/updator.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (

"golang.org/x/time/rate"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/pkg/errors"
"github.com/rs/zerolog"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/alces-flight/concertim-metric-reporting-daemon
module github.com/openflighthpc/concertim-metric-reporting-daemon

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion inmem/current_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sync"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
)

Expand Down
4 changes: 2 additions & 2 deletions inmem/data_source_map_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ package inmem
import (
"sync"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
)

Expand Down
2 changes: 1 addition & 1 deletion inmem/pending_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sync"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
)

Expand Down
2 changes: 1 addition & 1 deletion inmem/pending_repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"testing"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions rrd/historicRepo.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (
"strings"
"time"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
"golang.org/x/exp/slices"
)
Expand Down
4 changes: 2 additions & 2 deletions rrd/historicRepo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"strings"
"testing"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions visualizer/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
"net/http"
"strings"

"github.com/alces-flight/concertim-metric-reporting-daemon/config"
"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/go-chi/jwtauth/v5"
"github.com/openflighthpc/concertim-metric-reporting-daemon/config"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/pkg/errors"
"github.com/rs/zerolog"
)
Expand Down
2 changes: 1 addition & 1 deletion visualizer/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"encoding/json"
"fmt"

"github.com/alces-flight/concertim-metric-reporting-daemon/domain"
"github.com/openflighthpc/concertim-metric-reporting-daemon/domain"
"github.com/pkg/errors"
"github.com/rs/zerolog"
)
Expand Down

0 comments on commit 6370676

Please sign in to comment.