Volume Servers Over Time
@@ -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)
diff --git a/telemetry/test/integration.go b/telemetry/test/integration.go
index d0eea4777..c63ce82cb 100644
--- a/telemetry/test/integration.go
+++ b/telemetry/test/integration.go
@@ -151,8 +151,6 @@ func testProtobufMarshaling() error {
ClusterId: "test-cluster-12345",
Version: "test-3.45",
Os: "linux/amd64",
- Features: []string{"filer", "s3api"},
- Deployment: "test",
VolumeServerCount: 2,
TotalDiskBytes: 1000000,
TotalVolumeCount: 10,
@@ -197,8 +195,6 @@ func testTelemetryClient() error {
testData := &proto.TelemetryData{
Version: "test-3.45",
Os: "linux/amd64",
- Features: []string{"filer", "s3api", "mq"},
- Deployment: "integration-test",
VolumeServerCount: 3,
TotalDiskBytes: 1073741824, // 1GB
TotalVolumeCount: 50,
diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index 48576adf4..07108b070 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -149,14 +149,6 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers map[string]pb.Se
ms.telemetryCollector.SetVersion(version.VERSION_NUMBER)
ms.telemetryCollector.SetOS(runtime.GOOS + "/" + runtime.GOARCH)
- // Determine features and deployment type
- features := []string{"master"}
- if len(peers) > 1 {
- features = append(features, "cluster")
- }
- ms.telemetryCollector.SetFeatures(features)
- ms.telemetryCollector.SetDeployment(telemetry.DetermineDeployment(true, false, len(peers)))
-
// Start periodic telemetry collection (every 24 hours)
ms.telemetryCollector.StartPeriodicCollection(24 * time.Hour)
}
diff --git a/weed/telemetry/collector.go b/weed/telemetry/collector.go
index 7991d92c8..19d4452ef 100644
--- a/weed/telemetry/collector.go
+++ b/weed/telemetry/collector.go
@@ -14,8 +14,6 @@ type Collector struct {
topo *topology.Topology
cluster *cluster.Cluster
masterServer interface{} // Will be set to *weed_server.MasterServer to access client tracking
- features []string
- deployment string
version string
os string
}
@@ -27,23 +25,11 @@ func NewCollector(client *Client, topo *topology.Topology, cluster *cluster.Clus
topo: topo,
cluster: cluster,
masterServer: nil,
- features: []string{},
- deployment: "unknown",
version: "unknown",
os: "unknown",
}
}
-// SetFeatures sets the list of enabled features
-func (c *Collector) SetFeatures(features []string) {
- c.features = features
-}
-
-// SetDeployment sets the deployment type (standalone, cluster, etc.)
-func (c *Collector) SetDeployment(deployment string) {
- c.deployment = deployment
-}
-
// SetVersion sets the SeaweedFS version
func (c *Collector) SetVersion(version string) {
c.version = version
@@ -82,7 +68,7 @@ func (c *Collector) StartPeriodicCollection(interval time.Duration) {
// Send initial telemetry after a short delay
go func() {
- time.Sleep(30 * time.Second) // Wait for cluster to stabilize
+ time.Sleep(61 * time.Second) // Wait for cluster to stabilize
c.CollectAndSendAsync()
}()
@@ -99,11 +85,9 @@ func (c *Collector) StartPeriodicCollection(interval time.Duration) {
// collectData gathers telemetry data from the topology
func (c *Collector) collectData() *proto.TelemetryData {
data := &proto.TelemetryData{
- Version: c.version,
- Os: c.os,
- Features: c.features,
- Deployment: c.deployment,
- Timestamp: time.Now().Unix(),
+ Version: c.version,
+ Os: c.os,
+ Timestamp: time.Now().Unix(),
}
if c.topo != nil {
@@ -199,20 +183,3 @@ func (c *Collector) getAllBrokerGroups() []string {
// In a more sophisticated implementation, we could enumerate all groups
return []string{""}
}
-
-// DetermineDeployment determines the deployment type based on configuration
-func DetermineDeployment(isMasterEnabled, isVolumeEnabled bool, peerCount int) string {
- if isMasterEnabled && isVolumeEnabled {
- if peerCount > 1 {
- return "cluster"
- }
- return "standalone"
- }
- if isMasterEnabled {
- return "master-only"
- }
- if isVolumeEnabled {
- return "volume-only"
- }
- return "unknown"
-}