Unify env vars

README.md

@@ -64,19 +64,21 @@ Docker images are available on [DockerHub][docker].
 
 1. Set the following environment variables:
 
-* `AXIOM_DEPLOYMENT_URL`: URL of the Axiom deployment to use
-* `AXIOM_ACCESS_TOKEN`: **Personal Access** or **Ingest** token. Can be
+* `AXIOM_TOKEN`: **Personal Access** or **Ingest** token. Can be
   created under `Profile` or `Settings > Ingest Tokens`. For security reasons
   it is advised to use an Ingest Token with minimal privileges only.
-* `AXIOM_INGEST_DATASET`: Dataset to ingest into
+* `AXIOM_DATASET`: Dataset to ingest into.
 
-2. Run it: `./axiom-syslog-proxy` or using docker:
+When using Axiom Selfhost:
+
+* `AXIOM_URL`: URL of the Axiom deployment to use.
+
+2. Run it: `./axiom-syslog-proxy` or using Docker:
 
 ```shell
 docker run -p601:601/tcp -p514:514/udp  \
-  -e=AXIOM_DEPLOYMENT_URL=<AXIOM_DEPLOYMENT_URL> \
-  -e=AXIOM_ACCESS_TOKEN=<AXIOM_ACCESS_TOKEN> \
-  -e=AXIOM_INGEST_DATASET=<AXIOM_INGEST_DATASET> \
+  -e=AXIOM_TOKEN=<YOUR_AXIOM_TOKEN>     \
+  -e=AXIOM_DATASET=<YOUR_AXIOM_DATASET> \
   axiomhq/axiom-syslog-proxy
 ```
 

cmd/axiom-syslog-proxy/main.go

@@ -5,15 +5,16 @@ import (
 	"log"
 	"os"
 
+	"github.com/axiomhq/axiom-go/axiom"
 	"github.com/axiomhq/pkg/version"
 
 	"github.com/axiomhq/axiom-syslog-proxy/server"
 )
 
 var (
-	deploymentURL = os.Getenv("AXIOM_DEPLOYMENT_URL")
-	ingestToken   = os.Getenv("AXIOM_ACCESS_TOKEN")
-	ingestDataset = os.Getenv("AXIOM_INGEST_DATASET")
+	deploymentURL = os.Getenv("AXIOM_URL")
+	ingestToken   = os.Getenv("AXIOM_TOKEN")
+	ingestDataset = os.Getenv("AXIOM_DATASET")
 
 	addrTCP = flag.String("addr-tcp", ":601", "Listen address <ip>:<port>")
 	addrUDP = flag.String("addr-udp", ":514", "Listen address <ip>:<port>")
@@ -25,13 +26,13 @@ func main() {
 	flag.Parse()
 
 	if deploymentURL == "" {
-		log.Fatal("missing AXIOM_DEPLOYMENT_URL")
+		deploymentURL = axiom.CloudURL
 	}
 	if ingestToken == "" {
-		log.Fatal("missing AXIOM_ACCESS_TOKEN")
+		log.Fatal("missing AXIOM_TOKEN")
 	}
 	if ingestDataset == "" {
-		log.Fatal("missing AXIOM_INGEST_DATASET")
+		log.Fatal("missing AXIOM_DATASET")
 	}
 
 	config := &server.Config{