Distribute requests from alertmanager

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

Makefile

@@ -87,7 +87,7 @@ pkg/scheduler/schedulerpb/scheduler.pb.go: pkg/scheduler/schedulerpb/scheduler.p
 pkg/storegateway/storegatewaypb/gateway.pb.go: pkg/storegateway/storegatewaypb/gateway.proto
 pkg/chunk/grpc/grpc.pb.go: pkg/chunk/grpc/grpc.proto
 tools/blocksconvert/scheduler.pb.go: tools/blocksconvert/scheduler.proto
-pkg/alertmanager/client/alertmanager.pb.go: pkg/alertmanager/client/alertmanager.proto
+pkg/alertmanager/client/alertmanager.pb.go: pkg/alertmanager/alertmanagerpb/alertmanager.proto
 
 all: $(UPTODATE_FILES)
 test: protos

development/tsdb-blocks-storage-s3/docker-compose.yml

@@ -357,15 +357,3 @@ services:
       - 18014:18014
     volumes:
       - ./config:/cortex/config
-
-  alertmanager-distributor:
-    build:
-      context:    .
-      dockerfile: dev.dockerfile
-    image: cortex
-    command: ["sh", "-c", "sleep 3 && exec ./dlv exec ./cortex --listen=:18015 --headless=true --api-version=2 --accept-multiclient --continue -- -log.level=debug -config.file=./config/cortex.yaml -target=alertmanager-distributor -server.http-listen-port=8015 -server.grpc-listen-port=9015"]
-    ports:
-      - 8015:8015
-      - 18015:18015
-    volumes:
-      - ./config:/cortex/config

docs/configuration/config-file-reference.md

@@ -164,6 +164,26 @@ alertmanager_distributor:
   # CLI flag: -alertmanager.distributor.remote-timeout
   [remote_timeout: <duration> | default = 2s]
 
+  alertmanager_client:
+    # Path to the client certificate file, which will be used for authenticating
+    # with the server. Also requires the key path to be configured.
+    # CLI flag: -alertmanager-distributor.alertmanager-client.tls-cert-path
+    [tls_cert_path: <string> | default = ""]
+
+    # Path to the key file for the client certificate. Also requires the client
+    # certificate to be configured.
+    # CLI flag: -alertmanager-distributor.alertmanager-client.tls-key-path
+    [tls_key_path: <string> | default = ""]
+
+    # Path to the CA certificates file to validate server certificate against.
+    # If not set, the host's root CA certificates are used.
+    # CLI flag: -alertmanager-distributor.alertmanager-client.tls-ca-path
+    [tls_ca_path: <string> | default = ""]
+
+    # Skip validating server certificate.
+    # CLI flag: -alertmanager-distributor.alertmanager-client.tls-insecure-skip-verify
+    [tls_insecure_skip_verify: <boolean> | default = false]
+
 runtime_config:
   # How often to check runtime config file.
   # CLI flag: -runtime-config.reload-period

pkg/alertmanager/client/alertmanager.proto → pkg/alertmanager/alertmanagerpb/alertmanager.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package client;
+package alertmanagerpb;
 
 option go_package = "client";
 
@@ -16,7 +16,6 @@ service Alertmanager {
 }
 
 message Request {
-  string UserID = 1;
   httpgrpc.HTTPRequest httpRequest = 2;
 }
 

pkg/alertmanager/distributor/alertmanager_client.go

@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
-	am_client "github.com/cortexproject/cortex/pkg/alertmanager/client"
+	am_client "github.com/cortexproject/cortex/pkg/alertmanager/alertmanagerpb"
 	"github.com/cortexproject/cortex/pkg/ring/client"
 	"github.com/cortexproject/cortex/pkg/util/grpcclient"
 	"github.com/cortexproject/cortex/pkg/util/tls"