mirror of https://gerrit.osmocom.org/libosmocore
stats: don't mark reporter as 'disable' beforehand
Change-Id: I330a079807cca48b7cc43767abcd2b58830a05fc Related: SYS#5713
This commit is contained in:
parent
4f1c4e3027
commit
d6b00591f7
|
@ -638,8 +638,6 @@ static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_report
|
||||||
vty_out(vty, " %s", srep->name);
|
vty_out(vty, " %s", srep->name);
|
||||||
vty_out(vty, "%s", VTY_NEWLINE);
|
vty_out(vty, "%s", VTY_NEWLINE);
|
||||||
|
|
||||||
vty_out(vty, " disable%s", VTY_NEWLINE);
|
|
||||||
|
|
||||||
if (srep->have_net_config) {
|
if (srep->have_net_config) {
|
||||||
if (srep->dest_addr_str)
|
if (srep->dest_addr_str)
|
||||||
vty_out(vty, " remote-ip %s%s",
|
vty_out(vty, " remote-ip %s%s",
|
||||||
|
@ -672,6 +670,8 @@ static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_report
|
||||||
|
|
||||||
if (srep->enabled)
|
if (srep->enabled)
|
||||||
vty_out(vty, " enable%s", VTY_NEWLINE);
|
vty_out(vty, " enable%s", VTY_NEWLINE);
|
||||||
|
else
|
||||||
|
vty_out(vty, " disable%s", VTY_NEWLINE);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,9 +36,9 @@ stats_vty_test(config-stats)# show running-config
|
||||||
...
|
...
|
||||||
stats interval 5
|
stats interval 5
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
level global
|
level global
|
||||||
no prefix
|
no prefix
|
||||||
|
disable
|
||||||
...
|
...
|
||||||
|
|
||||||
stats_vty_test(config-stats)# level subscriber
|
stats_vty_test(config-stats)# level subscriber
|
||||||
|
@ -46,7 +46,6 @@ stats_vty_test(config-stats)# prefix statsd-prefix
|
||||||
stats_vty_test(config-stats)# show running-config
|
stats_vty_test(config-stats)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
level subscriber
|
level subscriber
|
||||||
prefix statsd-prefix
|
prefix statsd-prefix
|
||||||
...
|
...
|
||||||
|
@ -56,7 +55,6 @@ stats_vty_test(config-stats)# remote-port 6969
|
||||||
stats_vty_test(config-stats)# show running-config
|
stats_vty_test(config-stats)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
... !local-ip
|
... !local-ip
|
||||||
|
@ -65,7 +63,6 @@ stats_vty_test(config-stats)# local-ip 192.168.1.100
|
||||||
stats_vty_test(config-stats)# show running-config
|
stats_vty_test(config-stats)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
local-ip 192.168.1.100
|
local-ip 192.168.1.100
|
||||||
|
@ -81,7 +78,6 @@ stats_vty_test(config-stats)# mtu 1337
|
||||||
stats_vty_test(config-stats)# show running-config
|
stats_vty_test(config-stats)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
mtu 1337
|
mtu 1337
|
||||||
|
@ -97,7 +93,6 @@ stats_vty_test(config-stats)# flush-period 43556
|
||||||
stats_vty_test(config-stats)# show running-config
|
stats_vty_test(config-stats)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
level subscriber
|
level subscriber
|
||||||
|
@ -116,7 +111,6 @@ stats_vty_test(config-stats)# exit
|
||||||
stats_vty_test(config)# show running-config
|
stats_vty_test(config)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
level subscriber
|
level subscriber
|
||||||
|
@ -134,14 +128,12 @@ stats_vty_test(config-stats)# exit
|
||||||
stats_vty_test(config)# show running-config
|
stats_vty_test(config)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
level subscriber
|
level subscriber
|
||||||
prefix statsd-prefix
|
prefix statsd-prefix
|
||||||
enable
|
enable
|
||||||
stats reporter log
|
stats reporter log
|
||||||
disable
|
|
||||||
level peer
|
level peer
|
||||||
prefix log-prefix
|
prefix log-prefix
|
||||||
enable
|
enable
|
||||||
|
@ -175,34 +167,32 @@ stats_vty_test(config)# ### We should have 5 reporters now
|
||||||
stats_vty_test(config)# show running-config
|
stats_vty_test(config)# show running-config
|
||||||
...
|
...
|
||||||
stats reporter statsd
|
stats reporter statsd
|
||||||
disable
|
|
||||||
remote-ip 192.168.1.200
|
remote-ip 192.168.1.200
|
||||||
remote-port 6969
|
remote-port 6969
|
||||||
level subscriber
|
level subscriber
|
||||||
prefix statsd-prefix
|
prefix statsd-prefix
|
||||||
enable
|
enable
|
||||||
stats reporter log
|
stats reporter log
|
||||||
disable
|
|
||||||
level peer
|
level peer
|
||||||
prefix log-prefix
|
prefix log-prefix
|
||||||
enable
|
enable
|
||||||
stats reporter statsd statsd-foo
|
stats reporter statsd statsd-foo
|
||||||
disable
|
|
||||||
remote-ip 192.168.2.200
|
remote-ip 192.168.2.200
|
||||||
remote-port 9696
|
remote-port 9696
|
||||||
level global
|
level global
|
||||||
prefix statsd-one-prefix
|
prefix statsd-one-prefix
|
||||||
flush-period 1
|
flush-period 1
|
||||||
stats reporter log log-bar
|
|
||||||
disable
|
disable
|
||||||
|
stats reporter log log-bar
|
||||||
level global
|
level global
|
||||||
prefix log-bar-prefix
|
prefix log-bar-prefix
|
||||||
flush-period 2
|
flush-period 2
|
||||||
stats reporter log log-zoo
|
|
||||||
disable
|
disable
|
||||||
|
stats reporter log log-zoo
|
||||||
level global
|
level global
|
||||||
prefix log-zoo-prefix
|
prefix log-zoo-prefix
|
||||||
flush-period 3
|
flush-period 3
|
||||||
|
disable
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue