Separate our arguments from the others

grafana · Oct 3, 2024 · d2e6c5b · d2e6c5b
1 parent d145d09
commit d2e6c5b
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/web/web.go b/web/web.go
@@ -244,33 +244,35 @@ type Options struct {
 	Version               *PrometheusVersion
 	Flags                 map[string]string
 
-	ListenAddresses                            []string
-	CORSOrigin                                 *regexp.Regexp
-	ReadTimeout                                time.Duration
-	MaxConnections                             int
-	ExternalURL                                *url.URL
-	RoutePrefix                                string
-	UseLocalAssets                             bool
-	UserAssetsPath                             string
-	ConsoleTemplatesPath                       string
-	ConsoleLibrariesPath                       string
-	EnableLifecycle                            bool
-	EnableAdminAPI                             bool
-	PageTitle                                  string
-	RemoteReadSampleLimit                      int
-	RemoteReadConcurrencyLimit                 int
-	RemoteReadBytesInFrame                     int
-	EnableRemoteWriteReceiver                  bool
-	EnableOTLPWriteReceiver                    bool
-	EnableCreatedTimestampZeroIngestion        bool
-	ValidIntervalCreatedTimestampZeroIngestion time.Duration
-	IsAgent                                    bool
-	AppName                                    string
+	ListenAddresses            []string
+	CORSOrigin                 *regexp.Regexp
+	ReadTimeout                time.Duration
+	MaxConnections             int
+	ExternalURL                *url.URL
+	RoutePrefix                string
+	UseLocalAssets             bool
+	UserAssetsPath             string
+	ConsoleTemplatesPath       string
+	ConsoleLibrariesPath       string
+	EnableLifecycle            bool
+	EnableAdminAPI             bool
+	PageTitle                  string
+	RemoteReadSampleLimit      int
+	RemoteReadConcurrencyLimit int
+	RemoteReadBytesInFrame     int
+	EnableRemoteWriteReceiver  bool
+	EnableOTLPWriteReceiver    bool
+	IsAgent                    bool
+	AppName                    string
 
 	AcceptRemoteWriteProtoMsgs []config.RemoteWriteProtoMsg
 
 	Gatherer   prometheus.Gatherer
 	Registerer prometheus.Registerer
+
+	// Our Grafana Cloud additions. Leaving them separately for the updates with upstream.
+	EnableCreatedTimestampZeroIngestion        bool
+	ValidIntervalCreatedTimestampZeroIngestion time.Duration
 }
 
 // New initializes a new web Handler.