diff options
Diffstat (limited to 'telemetry/server')
| -rw-r--r-- | telemetry/server/dashboard/dashboard.go | 8 | ||||
| -rw-r--r-- | telemetry/server/storage/prometheus.go | 22 |
2 files changed, 8 insertions, 22 deletions
diff --git a/telemetry/server/dashboard/dashboard.go b/telemetry/server/dashboard/dashboard.go index 9a56c7f1b..f60021bba 100644 --- a/telemetry/server/dashboard/dashboard.go +++ b/telemetry/server/dashboard/dashboard.go @@ -123,10 +123,7 @@ func (h *Handler) ServeIndex(w http.ResponseWriter, r *http.Request) { <canvas id="osChart" width="400" height="200"></canvas> </div> - <div class="chart-container"> - <div class="chart-title">Deployment Types</div> - <canvas id="deploymentChart" width="400" height="200"></canvas> - </div> + <div class="chart-container"> <div class="chart-title">Volume Servers Over Time</div> @@ -178,8 +175,7 @@ func (h *Handler) ServeIndex(w http.ResponseWriter, r *http.Request) { // OS chart createPieChart('osChart', 'Operating System Distribution', stats.os_distribution || {}); - // Deployment chart - createPieChart('deploymentChart', 'Deployment Types', stats.deployments || {}); + // Server count over time if (metrics.dates && metrics.server_counts) { diff --git a/telemetry/server/storage/prometheus.go b/telemetry/server/storage/prometheus.go index d25dd669a..0b911227a 100644 --- a/telemetry/server/storage/prometheus.go +++ b/telemetry/server/storage/prometheus.go @@ -1,7 +1,6 @@ package storage import ( - "encoding/json" "sync" "time" @@ -47,27 +46,27 @@ func NewPrometheusStorage() *PrometheusStorage { volumeServerCount: promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "seaweedfs_telemetry_volume_servers", Help: "Number of volume servers per cluster", - }, []string{"cluster_id", "version", "os", "deployment"}), + }, []string{"cluster_id", "version", "os"}), totalDiskBytes: promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "seaweedfs_telemetry_disk_bytes", Help: "Total disk usage in bytes per cluster", - }, []string{"cluster_id", "version", "os", "deployment"}), + }, []string{"cluster_id", "version", "os"}), totalVolumeCount: promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "seaweedfs_telemetry_volume_count", Help: "Total number of volumes per cluster", - }, []string{"cluster_id", "version", "os", "deployment"}), + }, []string{"cluster_id", "version", "os"}), filerCount: promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "seaweedfs_telemetry_filer_count", Help: "Number of filer servers per cluster", - }, []string{"cluster_id", "version", "os", "deployment"}), + }, []string{"cluster_id", "version", "os"}), brokerCount: promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "seaweedfs_telemetry_broker_count", Help: "Number of broker servers per cluster", - }, []string{"cluster_id", "version", "os", "deployment"}), + }, []string{"cluster_id", "version", "os"}), clusterInfo: promauto.NewGaugeVec(prometheus.GaugeOpts{ Name: "seaweedfs_telemetry_cluster_info", Help: "Cluster information (always 1, labels contain metadata)", - }, []string{"cluster_id", "version", "os", "deployment", "features"}), + }, []string{"cluster_id", "version", "os"}), telemetryReceived: promauto.NewCounter(prometheus.CounterOpts{ Name: "seaweedfs_telemetry_reports_received_total", Help: "Total number of telemetry reports received", @@ -86,7 +85,6 @@ func (s *PrometheusStorage) StoreTelemetry(data *proto.TelemetryData) error { "cluster_id": data.ClusterId, "version": data.Version, "os": data.Os, - "deployment": data.Deployment, } s.volumeServerCount.With(labels).Set(float64(data.VolumeServerCount)) @@ -95,14 +93,10 @@ func (s *PrometheusStorage) StoreTelemetry(data *proto.TelemetryData) error { s.filerCount.With(labels).Set(float64(data.FilerCount)) s.brokerCount.With(labels).Set(float64(data.BrokerCount)) - // Features as JSON string for the label - featuresJSON, _ := json.Marshal(data.Features) infoLabels := prometheus.Labels{ "cluster_id": data.ClusterId, "version": data.Version, "os": data.Os, - "deployment": data.Deployment, - "features": string(featuresJSON), } s.clusterInfo.With(infoLabels).Set(1) @@ -188,7 +182,6 @@ func (s *PrometheusStorage) updateStats() { activeInstances := 0 versions := make(map[string]int) osDistribution := make(map[string]int) - deployments := make(map[string]int) for _, instance := range s.instances { if instance.ReceivedAt.After(last30Days) { @@ -198,7 +191,6 @@ func (s *PrometheusStorage) updateStats() { activeInstances++ versions[instance.TelemetryData.Version]++ osDistribution[instance.TelemetryData.Os]++ - deployments[instance.TelemetryData.Deployment]++ } } @@ -212,7 +204,6 @@ func (s *PrometheusStorage) updateStats() { "active_instances": activeInstances, "versions": versions, "os_distribution": osDistribution, - "deployments": deployments, } } @@ -231,7 +222,6 @@ func (s *PrometheusStorage) CleanupOldInstances(maxAge time.Duration) { "cluster_id": instance.TelemetryData.ClusterId, "version": instance.TelemetryData.Version, "os": instance.TelemetryData.Os, - "deployment": instance.TelemetryData.Deployment, } s.volumeServerCount.Delete(labels) s.totalDiskBytes.Delete(labels) |