Migrate to github.com/observatorium/api (#134)

Author: onprem

.gitignore

@@ -12,9 +12,10 @@
 *.out
 
 observatorium
+observatorium-api
 tmp/
 examples/vendor
 vendor
 .envrc
 .bin
-.idea
+.idea

Dockerfile

@@ -5,35 +5,35 @@ RUN apk add --update --no-cache ca-certificates tzdata git make bash && update-c
 ADD . /opt
 WORKDIR /opt
 
-RUN git update-index --refresh; make observatorium
+RUN git update-index --refresh; make build
 
 FROM alpine:3.12 as runner
 
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /opt/observatorium /bin/observatorium
+COPY --from=builder /opt/observatorium-api /bin/observatorium-api
 
 ARG BUILD_DATE
 ARG VERSION
 ARG VCS_REF
 ARG DOCKERFILE_PATH
 
 LABEL vendor="Observatorium" \
-    name="observatorium/observatorium" \
+    name="observatorium/api" \
     description="Observatorium API" \
-    io.k8s.display-name="observatorium/observatorium" \
+    io.k8s.display-name="observatorium/api" \
     io.k8s.description="Observatorium API" \
     maintainer="Observatorium <team-monitoring@redhat.com>" \
     version="$VERSION" \
     org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.description="Observatorium API" \
-    org.label-schema.docker.cmd="docker run --rm observatorium/observatorium" \
+    org.label-schema.docker.cmd="docker run --rm observatorium/api" \
     org.label-schema.docker.dockerfile=$DOCKERFILE_PATH \
-    org.label-schema.name="observatorium/observatorium" \
+    org.label-schema.name="observatorium/api" \
     org.label-schema.schema-version="1.0" \
     org.label-schema.vcs-branch=$VCS_BRANCH \
     org.label-schema.vcs-ref=$VCS_REF \
-    org.label-schema.vcs-url="https://github.com/observatorium/observatorium" \
-    org.label-schema.vendor="observatorium/observatorium" \
+    org.label-schema.vcs-url="https://github.com/observatorium/api" \
+    org.label-schema.vendor="observatorium/api" \
     org.label-schema.version=$VERSION
 
-ENTRYPOINT ["/bin/observatorium"]
+ENTRYPOINT ["/bin/observatorium-api"]

Makefile

@@ -8,19 +8,20 @@ FIRST_GOPATH := $(firstword $(subst :, ,$(shell go env GOPATH)))
 OS ?= $(shell uname -s | tr '[A-Z]' '[a-z]')
 ARCH ?= $(shell uname -m)
 GOARCH ?= $(shell go env GOARCH)
+BIN_NAME ?= observatorium-api
 
 VERSION := $(strip $(shell [ -d .git ] && git describe --always --tags --dirty))
 BUILD_DATE := $(shell date -u +"%Y-%m-%d")
 BUILD_TIMESTAMP := $(shell date -u +"%Y-%m-%dT%H:%M:%S%Z")
 VCS_BRANCH := $(strip $(shell git rev-parse --abbrev-ref HEAD))
 VCS_REF := $(strip $(shell [ -d .git ] && git rev-parse --short HEAD))
-DOCKER_REPO ?= quay.io/observatorium/observatorium
+DOCKER_REPO ?= quay.io/observatorium/api
 
 CONTAINER_CMD := docker run --rm \
 		-u="$(shell id -u):$(shell id -g)" \
 		-v "$(shell go env GOCACHE):/.cache/go-build" \
-		-v "$(PWD):/go/src/github.com/observatorium/observatorium:Z" \
-		-w "/go/src/github.com/observatorium/observatorium" \
+		-v "$(PWD):/go/src/github.com/observatorium/api:Z" \
+		-w "/go/src/github.com/observatorium/api" \
 		-e USER=deadbeef \
 		-e GO111MODULE=on \
 		quay.io/coreos/jsonnet-ci
@@ -50,11 +51,11 @@ PROTOC_VERSION ?= 3.13.0
 
 SERVER_CERT ?= $(CERT_DIR)/server.pem
 
-default: observatorium
-all: clean lint test observatorium generate validate
+default: $(BIN_NAME)
+all: clean lint test $(BIN_NAME) generate validate
 
-tmp/help.txt: observatorium $(TMP_DIR)
-	./observatorium --help &> $(TMP_DIR)/help.txt || true
+tmp/help.txt: $(BIN_NAME) $(TMP_DIR)
+	./$(BIN_NAME) --help &> $(TMP_DIR)/help.txt || true
 
 tmp/load_help.txt: $(TMP_DIR)
 	-./test/load.sh -h > $(TMP_DIR)/load_help.txt 2&>1
@@ -67,11 +68,11 @@ benchmark.md: $(EMBEDMD) tmp/load_help.txt
 	PATH=$$PATH:$(BIN_DIR):$(FIRST_GOPATH)/bin ./test/load.sh -r 300 -c 1000 -m 3 -q 10 -o gnuplot
 	$(EMBEDMD) -w docs/benchmark.md
 
-observatorium: deps main.go $(wildcard *.go) $(wildcard */*.go)
-	CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(GOARCH) GO111MODULE=on GOPROXY=https://proxy.golang.org go build -a -ldflags '-s -w' -o $@ .
+$(BIN_NAME): deps main.go $(wildcard *.go) $(wildcard */*.go)
+	CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(GOARCH) GO111MODULE=on GOPROXY=https://proxy.golang.org go build -a -ldflags '-s -w' -o $(BIN_NAME) .
 
 .PHONY: build
-build: observatorium
+build: $(BIN_NAME)
 
 .PHONY: run
 run: build $(THANOS) $(DEX) $(LOKI) generate-cert
@@ -115,7 +116,7 @@ clean:
 	-rm tmp/help.txt
 	-rm -rf tmp/bin
 	-rm -rf tmp/src
-	-rm observatorium
+	-rm $(BIN_NAME)
 
 ratelimit/gubernator/proto/google:
 	mkdir -p $(TMP_DIR)/src/grpc-gateway
@@ -211,11 +212,11 @@ $(SHELLCHECK): $(BIN_DIR)
 	curl -sNL "https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.$(OS).$(ARCH).tar.xz" | tar --strip-components=1 -xJf - -C $(BIN_DIR)
 
 $(MOCKPROVIDER): | deps $(BIN_DIR)
-	go build -tags tools -o $@ github.com/observatorium/observatorium/test/mock
+	go build -tags tools -o $@ github.com/observatorium/api/test/mock
 
 $(GENERATE_TLS_CERT): | deps $(BIN_DIR)
 	# A thin wrapper around github.com/cloudflare/cfssl
-	go build -tags tools -o $@ github.com/observatorium/observatorium/test/tls
+	go build -tags tools -o $@ github.com/observatorium/api/test/tls
 
 $(PROTOC): $(TMP_DIR) $(BIN_DIR)
 	@PROTOC_VERSION="$(PROTOC_VERSION)" TMP_DIR="$(TMP_DIR)" BIN_DIR="$(BIN_DIR)" scripts/install_protoc.sh

README.md

@@ -1,8 +1,8 @@
 # Observatorium
 
-[![CircleCI](https://circleci.com/gh/observatorium/observatorium.svg?style=svg)](https://circleci.com/gh/observatorium/observatorium)
-[![Go Doc](https://godoc.org/github.com/observatorium/observatorium?status.svg)](http://godoc.org/github.com/observatorium/observatorium)
-[![Go Report Card](https://goreportcard.com/badge/github.com/observatorium/observatorium)](https://goreportcard.com/report/github.com/observatorium/observatorium)
+[![CircleCI](https://circleci.com/gh/observatorium/api.svg?style=svg)](https://circleci.com/gh/observatorium/api)
+[![Go Doc](https://godoc.org/github.com/observatorium/api?status.svg)](http://godoc.org/github.com/observatorium/api)
+[![Go Report Card](https://goreportcard.com/badge/github.com/observatorium/api)](https://goreportcard.com/report/github.com/observatorium/api)
 
 This project is an API server for Observatorium.
 The API provides an authenticated and authorized, multi-tenant interface for writing and reading observability signals, i.e. metrics and logs.

api/logs/v1/http.go

@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 
-	"github.com/observatorium/observatorium/proxy"
+	"github.com/observatorium/api/proxy"
 )
 
 const (

api/metrics/legacy/http.go

@@ -12,7 +12,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 
-	"github.com/observatorium/observatorium/proxy"
+	"github.com/observatorium/api/proxy"
 )
 
 const (

api/metrics/v1/http.go

@@ -12,7 +12,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 
-	"github.com/observatorium/observatorium/proxy"
+	"github.com/observatorium/api/proxy"
 )
 
 const (

authorization/http.go

@@ -3,8 +3,8 @@ package authorization
 import (
 	"net/http"
 
-	"github.com/observatorium/observatorium/authentication"
-	"github.com/observatorium/observatorium/rbac"
+	"github.com/observatorium/api/authentication"
+	"github.com/observatorium/api/rbac"
 )
 
 // WithAuthorizers returns a middleware that authorizes subjects taken from a request context

examples/main.jsonnet

@@ -3,7 +3,7 @@ local config = {
   name: 'observatorium-api',
   namespace: 'observatorium',
   version: 'master-2020-09-04-v0.1.1-131-ga4c5a9c',
-  image: 'quay.io/observatorium/observatorium:' + cfg.version,
+  image: 'quay.io/observatorium/api:' + cfg.version,
   replicas: 3,
   metrics: {
     readEndpoint: 'http://127.0.0.1:9091',

examples/manifests/deployment-with-tls.yaml

@@ -45,6 +45,7 @@ spec:
         - --tls.healthchecks.server-ca-file=/var/run/tls/ca
         - --tls.reload-interval=1m
         - --tls.healthchecks.server-name=example.com
+        # TODO(onprem): Update to observatorium/api when a image is published.
         image: quay.io/observatorium/observatorium:master-2020-09-04-v0.1.1-131-ga4c5a9c
         livenessProbe:
           failureThreshold: 10