Merge pull request #6 from DeepLcom/NET-1220

Net-1220 - added some sub categories for  " show system statistics "

Author: surprise30

collectors.go

@@ -46,6 +46,7 @@ import (
 	"github.com/czerwonk/junos_exporter/pkg/features/storage"
 	"github.com/czerwonk/junos_exporter/pkg/features/subscriber"
 	"github.com/czerwonk/junos_exporter/pkg/features/system"
+	"github.com/czerwonk/junos_exporter/pkg/features/systemstatistics"
 	"github.com/czerwonk/junos_exporter/pkg/features/twamp"
 	"github.com/czerwonk/junos_exporter/pkg/features/vpws"
 	"github.com/czerwonk/junos_exporter/pkg/features/vrrp"
@@ -130,6 +131,8 @@ func (c *collectors) initCollectorsForDevices(device *connector.Device, descRe *
 	c.addCollectorIfEnabledForDevice(device, "ddosprotection", f.DDOSProtection, ddosprotection.NewCollector)
 	c.addCollectorIfEnabledForDevice(device, "krt", f.KRT, krt.NewCollector)
 	c.addCollectorIfEnabledForDevice(device, "twamp", f.TWAMP, twamp.NewCollector)
+	c.addCollectorIfEnabledForDevice(device, "system_statistics", f.SystemStatistics, systemstatistics.NewCollector)
+
 }
 
 func (c *collectors) addCollectorIfEnabledForDevice(device *connector.Device, key string, enabled bool, newCollector func() collector.RPCCollector) {

internal/config/config.go

@@ -103,6 +103,8 @@ type FeatureConfig struct {
 	DDOSProtection      bool `yaml:"ddos_protection,omitempty"`
 	KRT                 bool `yaml:"krt,omitempty"`
 	TWAMP               bool `yaml:"twamp,omitempty"`
+	SystemStatistics    bool `yaml:"system_statistics,omitempty"`
+
 }
 
 // New creates a new config
@@ -182,6 +184,7 @@ func setDefaultValues(c *Config) {
 	f.License = false
 	f.MACSec = true
 	f.Poe = false
+	f.SystemStatistics = true
 }
 
 // FeaturesForDevice gets the feature set configured for a device

main.go

@@ -90,6 +90,7 @@ var (
 	poeEnabled                  = flag.Bool("poe.enabled", true, "Scrape PoE metrics")
 	krtEnabled                  = flag.Bool("krt.enabled", false, "Scrape KRT queue metrics")
 	twampEnabled                = flag.Bool("twamp.enabled", false, "Scrape TWAMP metrics")
+	systemstatisticsEnabled 	= flag.Bool("systemstatistics.enabled", true, "Scrape system statistics metrics")
 	cfg                         *config.Config
 	devices                     []*connector.Device
 	connManager                 *connector.SSHConnectionManager
@@ -266,6 +267,7 @@ func loadConfigFromFlags() *config.Config {
 	f.Poe = *poeEnabled
 	f.KRT = *krtEnabled
 	f.TWAMP = *twampEnabled
+	f.SystemStatistics = *systemstatisticsEnabled
 	return c
 }