Adding spec version to dashboard.

splitio · May 4, 2024 · a1d87c7 · a1d87c7
1 parent 00c9951
commit a1d87c7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/splitio/admin/admin.go b/splitio/admin/admin.go
@@ -39,6 +39,7 @@ type Options struct {
 	Snapshotter       cstorage.Snapshotter
 	TLS               *tls.Config
 	FullConfig        interface{}
+	SpecVersion       string
 }
 
 type AdminServer struct {
@@ -66,6 +67,7 @@ func NewServer(options *Options) (*AdminServer, error) {
 		options.EventsEvCalc,
 		options.Runtime,
 		options.HcAppMonitor,
+		options.SpecVersion,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("error instantiating dashboard controller: %w", err)

diff --git a/splitio/admin/controllers/dashboard.go b/splitio/admin/controllers/dashboard.go
@@ -29,6 +29,7 @@ type DashboardController struct {
 	eventsEvCalc      evcalc.Monitor
 	runtime           common.Runtime
 	appMonitor        application.MonitorIterface
+	specVersion       string
 }
 
 // NewDashboardController instantiates a new dashboard controller
@@ -41,6 +42,7 @@ func NewDashboardController(
 	eventsEvCalc evcalc.Monitor,
 	runtime common.Runtime,
 	appMonitor application.MonitorIterface,
+	specVersion string,
 ) (*DashboardController, error) {
 
 	toReturn := &DashboardController{
@@ -52,6 +54,7 @@ func NewDashboardController(
 		eventsEvCalc:      eventsEvCalc,
 		impressionsEvCalc: impressionEvCalc,
 		appMonitor:        appMonitor,
+		specVersion:       specVersion,
 	}
 
 	var err error
@@ -110,6 +113,7 @@ func (c *DashboardController) renderDashboard() ([]byte, error) {
 		RefreshTime:    30000,
 		Stats:          *c.gatherStats(),
 		Health:         c.appMonitor.GetHealthStatus(),
+		SpecVersion:    c.specVersion,
 	})
 
 	if err != nil {

diff --git a/splitio/admin/views/dashboard/main.go b/splitio/admin/views/dashboard/main.go
@@ -45,7 +45,7 @@ const main = `
 	  {{template "SplitLogo" .}}
         </div>
         <div class="pull-right" style="text-align: center; padding-right: 10px;">
-	  <p style="padding-top: 8px; color: white; margin: 0px; font-weight: bold; text-align: right"><span>{{.Version}}</span></p>
+	  <p style="padding-top: 8px; color: white; margin: 0px; font-weight: bold; text-align: right"><span>{{.Version}}</span> | s=<span>{{.SpecVersion}}</span></p>
           <p class="navbar-text navbar-right" style="padding-top: 0px;margin-bottom: 15px;margin-top: 0px;color:white;min-width: 175px;height: 10px;">
             <a href="#" onclick="javascript:sendSignal('graceful'); return false;" class="navbar-link">
 	      <span class="label label-success">Graceful stop</span>
@@ -83,6 +83,7 @@ type RootObject struct {
 	Stats          GlobalStats           `json:"stats"`
 	Health         application.HealthDto `json:"health"`
 	ServicesHealth services.HealthDto    `json:"servicesHealth"`
+	SpecVersion    string
 }
 
 // GlobalStats runtime stats used to render the dashboard

diff --git a/splitio/commitversion.go b/splitio/commitversion.go
@@ -5,4 +5,4 @@ This file is created automatically, please do not edit
 */
 
 // CommitVersion is the version of the last commit previous to release
-const CommitVersion = "eb1a57b"
+const CommitVersion = "00c9951"
diff --git a/splitio/producer/initialization.go b/splitio/producer/initialization.go
@@ -300,6 +300,7 @@ func Start(logger logging.LoggerInterface, cfg *conf.Main) error {
 		HcServicesMonitor: servicesMonitor,
 		FullConfig:        cfgForAdmin,
 		TLS:               adminTLSConfig,
+		SpecVersion:       cfg.SpecVersion,
 	})
 	if err != nil {
 		panic(err.Error())

diff --git a/splitio/proxy/initialization.go b/splitio/proxy/initialization.go
@@ -224,6 +224,7 @@ func Start(logger logging.LoggerInterface, cfg *pconf.Main) error {
 		HcServicesMonitor: servicesMonitor,
 		FullConfig:        cfgForAdmin,
 		TLS:               adminTLSConfig,
+		SpecVersion:       cfg.SpecVersion,
 	})
 	if err != nil {
 		return common.NewInitError(fmt.Errorf("error starting admin server: %w", err), common.ExitAdminError)