updated docs

Author: AndrewChubatiuk

app/vlselect/main.go

@@ -3,6 +3,7 @@ package vlselect
 import (
 	"context"
 	"embed"
+	"encoding/json"
 	"flag"
 	"fmt"
 	"net/http"
@@ -52,6 +53,7 @@ func getDefaultMaxConcurrentRequests() int {
 // Init initializes vlselect
 func Init() {
 	concurrencyLimitCh = make(chan struct{}, *maxConcurrentRequests)
+	initVMUIConfig()
 	initVMAlertProxy()
 }
 
@@ -116,6 +118,11 @@ func selectHandler(w http.ResponseWriter, r *http.Request, path string) bool {
 		return true
 	}
 	if strings.HasPrefix(path, "/select/vmui/") {
+		if path == "/select/vmui/config.json" {
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprint(w, vmuiConfig)
+			return true
+		}
 		if strings.HasPrefix(path, "/select/vmui/static/") {
 			// Allow clients caching static contents for long period of time, since it shouldn't change over time.
 			// Path to static contents (such as js and css) must be changed whenever its contents is changed.
@@ -217,6 +224,17 @@ func decRequestConcurrency() {
 func processSelectRequest(ctx context.Context, w http.ResponseWriter, r *http.Request, path string) bool {
 	httpserver.EnableCORS(w, r)
 	startTime := time.Now()
+	if strings.HasPrefix(path, "/select/vmalert/") {
+		vmalertRequests.Inc()
+		if len(*vmalertProxyURL) == 0 {
+			w.WriteHeader(http.StatusBadRequest)
+			w.Header().Set("Content-Type", "application/json")
+			fmt.Fprintf(w, "%s", `{"status":"error","msg":"for accessing vmalert flag '-vmalert.proxyURL' must be configured"}`)
+			return true
+		}
+		proxyVMAlertRequests(w, r)
+		return true
+	}
 	switch path {
 	case "/select/logsql/facets":
 		logsqlFacetsRequests.Inc()
@@ -273,36 +291,6 @@ func processSelectRequest(ctx context.Context, w http.ResponseWriter, r *http.Re
 		logsql.ProcessStreamsRequest(ctx, w, r)
 		logsqlStreamsDuration.UpdateDuration(startTime)
 		return true
-	case "/select/api/v1/notifiers":
-		notifiersRequests.Inc()
-		if len(*vmalertProxyURL) > 0 {
-			r.URL.Path = path[len("/select"):]
-			proxyVMAlertRequests(w, r)
-			return true
-		}
-		w.Header().Set("Content-Type", "application/json")
-		fmt.Fprint(w, `{"status":"success","data":{"notifiers":[]}}`)
-		return true
-	case "/select/api/v1/alerts":
-		alertsRequests.Inc()
-		if len(*vmalertProxyURL) > 0 {
-			r.URL.Path = path[len("/select"):]
-			proxyVMAlertRequests(w, r)
-			return true
-		}
-		w.Header().Set("Content-Type", "application/json")
-		fmt.Fprint(w, `{"status":"success","data":{"alerts":[]}}`)
-		return true
-	case "/select/api/v1/rules":
-		rulesRequests.Inc()
-		if len(*vmalertProxyURL) > 0 {
-			r.URL.Path = path[len("/select"):]
-			proxyVMAlertRequests(w, r)
-			return true
-		}
-		w.Header().Set("Content-Type", "application/json")
-		fmt.Fprint(w, `{"status":"success","data":{"rules":[]}}`)
-		return true
 	default:
 		return false
 	}
@@ -332,10 +320,36 @@ func proxyVMAlertRequests(w http.ResponseWriter, r *http.Request) {
 		// Forward other panics to the caller.
 		panic(err)
 	}()
+	r.URL.Path = strings.TrimPrefix(r.URL.Path, "/select")
 	r.Host = vmalertProxyHost
 	vmalertProxy.ServeHTTP(w, r)
 }
 
+func initVMUIConfig() {
+	var cfg struct {
+		License struct {
+			Type string `json:"type"`
+		} `json:"license"`
+		VMAlert struct {
+			Enabled bool `json:"enabled"`
+		} `json:"vmalert"`
+	}
+	data, err := vmuiFiles.ReadFile("vmui/config.json")
+	if err != nil {
+		logger.Fatalf("cannot read vmui default config: %s", err)
+	}
+	err = json.Unmarshal(data, &cfg)
+	if err != nil {
+		logger.Fatalf("cannot parse vmui default config: %s", err)
+	}
+	cfg.VMAlert.Enabled = len(*vmalertProxyURL) != 0
+	data, err = json.Marshal(&cfg)
+	if err != nil {
+		logger.Fatalf("cannot create vmui config: %s", err)
+	}
+	vmuiConfig = string(data)
+}
+
 // initVMAlertProxy must be called after flag.Parse(), since it uses command-line flags.
 func initVMAlertProxy() {
 	if len(*vmalertProxyURL) == 0 {
@@ -352,6 +366,7 @@ func initVMAlertProxy() {
 var (
 	vmalertProxyHost string
 	vmalertProxy     *nethttputil.ReverseProxy
+	vmuiConfig       string
 )
 
 var (
@@ -391,7 +406,5 @@ var (
 	// no need to track duration for tail requests, as they usually take long time
 	logsqlTailRequests = metrics.NewCounter(`vl_http_requests_total{path="/select/logsql/tail"}`)
 
-	rulesRequests     = metrics.NewCounter(`vl_http_requests_total{path="/select/api/v1/rules"}`)
-	alertsRequests    = metrics.NewCounter(`vl_http_requests_total{path="/select/api/v1/alerts"}`)
-	notifiersRequests = metrics.NewCounter(`vl_http_requests_total{path="/select/api/v1/notifiers"}`)
+	vmalertRequests = metrics.NewCounter(`vl_http_requests_total{path="/select/vmalert"}`)
 )

docs/victorialogs/CHANGELOG.md

@@ -21,7 +21,7 @@ according to [these docs](https://docs.victoriametrics.com/victorialogs/quicksta
 * FEATURE: [`extract` pipe](https://docs.victoriametrics.com/victorialogs/logsql/#extract-pipe): the `<...>` placeholder now matchs quoted strings in single quotes additionally to strings in double quotes and backticks. For example, the `<login>` placeholder at the `... | extact "login=<login>,"` now matches `foo,bar` for the log message with the text `login='foo,bar'`.
 * FEATURE: [LogsQL](https://docs.victoriametrics.com/victorialogs/logsql/): add [pattern match filter](https://docs.victoriametrics.com/victorialogs/logsql/#pattern-match-filter) for searching logs by the given patterns such as `<DATETIME>: user_id=<N>, ip=<IP4>, trace_id=<UUID>`. These filters are needed for [#518](https://github.com/VictoriaMetrics/VictoriaLogs/issues/518).
 * FEATURE: [Syslog data ingestion](https://docs.victoriametrics.com/victorialogs/data-ingestion/syslog/): support for receiving Syslog messages from Unix sockets of `SOCK_STREAM` and `SOCK_DGRAM` types via `-syslog.listenAddr.unix=/path/to/socket` and `-syslog.listenAddr.unix=unixgram:/path/to/socket` command-line flags. See [#570](https://github.com/VictoriaMetrics/VictoriaLogs/issues/570).
-* FEATURE: proxy requests to `/select/api/v1/notifiers`, `/select/api/v1/alerts` and `/select/api/v1/rules` to VMAlert, when `-vmalert.proxyURL` flag is set. See [#8272](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8272).
+* FEATURE: proxy VMAlert requests at `/select/vmalert` path, when `-vmalert.proxyURL` flag is set. See [#8272](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8272).
 
 * BUGFIX: [querying](https://docs.victoriametrics.com/victorialogs/querying/): `-search.maxQueryTimeRange` command-line flag now supports day (`d`), week (`w`) and year (`y`) suffixes additionally to the supported hour (`h`), minute (`m`) and second (`s`) suffixes. See [#50](https://github.com/VictoriaMetrics/VictoriaLogs/issues/50#issuecomment-3244097676).
 * BUGFIX: [querying](https://docs.victoriametrics.com/victorialogs/querying/): properly handle the `offset` HTTP parameter when it is not set. This improves querying performance in VictoriaLogs cluster. See [#620](https://github.com/VictoriaMetrics/VictoriaLogs/issues/620).

docs/victorialogs/README.md

@@ -341,13 +341,10 @@ It is also possible to use **the disk snapshot** feature provided by the operati
 
 ## vmalert
 
-VictoriaLogs is capable of proxying requests to [vmalert](https://docs.victoriametrics.com/victoriametrics/vmalert/)
-when `-vmalert.proxyURL` flag is set. Use this feature for the following cases:
-* for proxying requests from [Grafana Alerting UI](https://grafana.com/docs/grafana/latest/alerting/);
-* for accessing vmalerts UI through VictoriaLogs Web interface.
+VictoriaLogs is capable of proxying requests to [VMAlert](https://docs.victoriametrics.com/victoriametrics/vmalert/)
+when `-vmalert.proxyURL` flag is set. Use this feature for accessing VMAlert API through VictoriaLogs Web interface.
 
-For accessing vmalerts UI through VictoriaLogs configure `-vmalert.proxyURL` flag and visit
-`http://<victorialogs-addr>:9428/vmalert/` link.
+For accessing VMAlert API through VictoriaLogs configure `-vmalert.proxyURL` flag. All VMAlert endpoints become available at `http://<victorialogs-addr>:9428/select/vmalert`.
 
 ## Multitenancy