Skip to content

Commit 166571b

Browse files
al1imgal1img
committed
[aostypes] Rename InTraffic, OutTraffic to Download, Upload
Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@epam.com>
1 parent e775961 commit 166571b

File tree

3 files changed

+96
-96
lines changed

3 files changed

+96
-96
lines changed

‎aostypes/aostypes.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ type PartitionUsage struct {
228228

229229
// MonitoringData monitoring data.
230230
type MonitoringData struct {
231-
Timestamp time.Time `json:"timestamp"`
232-
RAM uint64 `json:"ram"`
233-
CPU uint64 `json:"cpu"`
234-
InTraffic uint64 `json:"inTraffic"`
235-
OutTraffic uint64 `json:"outTraffic"`
236-
Disk []PartitionUsage `json:"disk"`
231+
Timestamp time.Time `json:"timestamp"`
232+
RAM uint64 `json:"ram"`
233+
CPU uint64 `json:"cpu"`
234+
Download uint64 `json:"download"`
235+
Upload uint64 `json:"upload"`
236+
Disk []PartitionUsage `json:"disk"`
237237
}
238238

239239
type InstanceMonitoring struct {

‎resourcemonitor/resourcemonitor.go

+39-39
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ type instanceMonitoring struct {
148148
}
149149

150150
type averageMonitoring struct {
151-
ram *averageCalc
152-
cpu *averageCalc
153-
inTraffic *averageCalc
154-
outTraffic *averageCalc
155-
disks map[string]*averageCalc
151+
ram *averageCalc
152+
cpu *averageCalc
153+
download *averageCalc
154+
upload *averageCalc
155+
disks map[string]*averageCalc
156156
}
157157

158158
/***********************************************************************************************************************
@@ -420,7 +420,7 @@ func (monitor *ResourceMonitor) setupSystemAlerts(nodeConfig cloudprotocol.NodeC
420420
if nodeConfig.AlertRules.Download != nil {
421421
monitor.alertProcessors.PushBack(createAlertProcessorPoints(
422422
"Download traffic",
423-
&monitor.nodeMonitoring.InTraffic,
423+
&monitor.nodeMonitoring.Download,
424424
func(time time.Time, value uint64, status string) {
425425
monitor.alertSender.SendAlert(prepareSystemAlertItem(nodeID, "download", time, value, status))
426426
},
@@ -430,7 +430,7 @@ func (monitor *ResourceMonitor) setupSystemAlerts(nodeConfig cloudprotocol.NodeC
430430
if nodeConfig.AlertRules.Upload != nil {
431431
monitor.alertProcessors.PushBack(createAlertProcessorPoints(
432432
"Upload traffic",
433-
&monitor.nodeMonitoring.OutTraffic,
433+
&monitor.nodeMonitoring.Upload,
434434
func(time time.Time, value uint64, status string) {
435435
monitor.alertSender.SendAlert(prepareSystemAlertItem(nodeID, "upload", time, value, status))
436436
},
@@ -548,7 +548,7 @@ func (monitor *ResourceMonitor) setupInstanceAlerts(instanceID string, instanceM
548548
if rules.Download != nil {
549549
e := monitor.alertProcessors.PushBack(createAlertProcessorPoints(
550550
instanceID+" download traffic",
551-
&instanceMonitoring.monitoring.InTraffic,
551+
&instanceMonitoring.monitoring.Download,
552552
func(time time.Time, value uint64, status string) {
553553
monitor.alertSender.SendAlert(
554554
prepareInstanceAlertItem(
@@ -561,7 +561,7 @@ func (monitor *ResourceMonitor) setupInstanceAlerts(instanceID string, instanceM
561561
if rules.Upload != nil {
562562
e := monitor.alertProcessors.PushBack(createAlertProcessorPoints(
563563
instanceID+" upload traffic",
564-
&instanceMonitoring.monitoring.OutTraffic,
564+
&instanceMonitoring.monitoring.Upload,
565565
func(time time.Time, value uint64, status string) {
566566
monitor.alertSender.SendAlert(
567567
prepareInstanceAlertItem(
@@ -619,23 +619,23 @@ func (monitor *ResourceMonitor) getCurrentSystemData() {
619619
}
620620

621621
if monitor.trafficMonitoring != nil {
622-
inTraffic, outTraffic, err := monitor.trafficMonitoring.GetSystemTraffic()
622+
download, upload, err := monitor.trafficMonitoring.GetSystemTraffic()
623623
if err != nil {
624624
log.Errorf("Can't get system traffic value: %s", err)
625625
}
626626

627-
monitor.nodeMonitoring.InTraffic = inTraffic
628-
monitor.nodeMonitoring.OutTraffic = outTraffic
627+
monitor.nodeMonitoring.Download = download
628+
monitor.nodeMonitoring.Upload = upload
629629
}
630630

631631
monitor.nodeAverageData.updateMonitoringData(monitor.nodeMonitoring)
632632

633633
log.WithFields(log.Fields{
634-
"CPU": monitor.nodeMonitoring.CPU,
635-
"RAM": monitor.nodeMonitoring.RAM,
636-
"Disk": monitor.nodeMonitoring.Disk,
637-
"IN": monitor.nodeMonitoring.InTraffic,
638-
"OUT": monitor.nodeMonitoring.OutTraffic,
634+
"CPU": monitor.nodeMonitoring.CPU,
635+
"RAM": monitor.nodeMonitoring.RAM,
636+
"Disk": monitor.nodeMonitoring.Disk,
637+
"Download": monitor.nodeMonitoring.Download,
638+
"Upload": monitor.nodeMonitoring.Upload,
639639
}).Debug("Monitoring data")
640640
}
641641

@@ -660,24 +660,24 @@ func (monitor *ResourceMonitor) getCurrentInstancesData() {
660660
}
661661

662662
if monitor.trafficMonitoring != nil {
663-
inTraffic, outTraffic, err := monitor.trafficMonitoring.GetInstanceTraffic(instanceID)
663+
download, upload, err := monitor.trafficMonitoring.GetInstanceTraffic(instanceID)
664664
if err != nil {
665665
log.Errorf("Can't get service traffic: %s", err)
666666
}
667667

668-
value.monitoring.InTraffic = inTraffic
669-
value.monitoring.OutTraffic = outTraffic
668+
value.monitoring.Download = download
669+
value.monitoring.Upload = upload
670670
}
671671

672672
value.averageData.updateMonitoringData(value.monitoring.MonitoringData)
673673

674674
log.WithFields(log.Fields{
675-
"id": instanceID,
676-
"CPU": value.monitoring.CPU,
677-
"RAM": value.monitoring.RAM,
678-
"Disk": value.monitoring.Disk,
679-
"IN": value.monitoring.InTraffic,
680-
"OUT": value.monitoring.OutTraffic,
675+
"id": instanceID,
676+
"CPU": value.monitoring.CPU,
677+
"RAM": value.monitoring.RAM,
678+
"Disk": value.monitoring.Disk,
679+
"Download": value.monitoring.Download,
680+
"Upload": value.monitoring.Upload,
681681
}).Debug("Instance monitoring data")
682682
}
683683
}
@@ -779,11 +779,11 @@ func (monitor *ResourceMonitor) cpuToDMIPs(cpu float64) uint64 {
779779

780780
func newAverageMonitoring(windowCount uint64, partitions []aostypes.PartitionUsage) *averageMonitoring {
781781
averageMonitoring := &averageMonitoring{
782-
ram: newAverageCalc(windowCount),
783-
cpu: newAverageCalc(windowCount),
784-
inTraffic: newAverageCalc(windowCount),
785-
outTraffic: newAverageCalc(windowCount),
786-
disks: make(map[string]*averageCalc),
782+
ram: newAverageCalc(windowCount),
783+
cpu: newAverageCalc(windowCount),
784+
download: newAverageCalc(windowCount),
785+
upload: newAverageCalc(windowCount),
786+
disks: make(map[string]*averageCalc),
787787
}
788788

789789
for _, partition := range partitions {
@@ -795,12 +795,12 @@ func newAverageMonitoring(windowCount uint64, partitions []aostypes.PartitionUsa
795795

796796
func (average *averageMonitoring) toMonitoringData(timestamp time.Time) aostypes.MonitoringData {
797797
data := aostypes.MonitoringData{
798-
CPU: average.cpu.getIntValue(),
799-
RAM: average.ram.getIntValue(),
800-
InTraffic: average.inTraffic.getIntValue(),
801-
OutTraffic: average.outTraffic.getIntValue(),
802-
Disk: make([]aostypes.PartitionUsage, 0, len(average.disks)),
803-
Timestamp: timestamp,
798+
CPU: average.cpu.getIntValue(),
799+
RAM: average.ram.getIntValue(),
800+
Download: average.download.getIntValue(),
801+
Upload: average.upload.getIntValue(),
802+
Disk: make([]aostypes.PartitionUsage, 0, len(average.disks)),
803+
Timestamp: timestamp,
804804
}
805805

806806
for name, diskUsage := range average.disks {
@@ -815,8 +815,8 @@ func (average *averageMonitoring) toMonitoringData(timestamp time.Time) aostypes
815815
func (average *averageMonitoring) updateMonitoringData(data aostypes.MonitoringData) {
816816
average.cpu.calculate(float64(data.CPU))
817817
average.ram.calculate(float64(data.RAM))
818-
average.inTraffic.calculate(float64(data.InTraffic))
819-
average.outTraffic.calculate(float64(data.OutTraffic))
818+
average.download.calculate(float64(data.Download))
819+
average.upload.calculate(float64(data.Upload))
820820

821821
for _, disk := range data.Disk {
822822
averageCalc, ok := average.disks[disk.Name]

‎resourcemonitor/resourcemonitor_internal_test.go

+51-51
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ func TestSystemAlerts(t *testing.T) {
242242
monitoringData: aostypes.NodeMonitoring{
243243
NodeID: "testNode",
244244
NodeData: aostypes.MonitoringData{
245-
CPU: 3500,
246-
RAM: 1100,
247-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 2300}},
248-
InTraffic: 150,
249-
OutTraffic: 150,
245+
CPU: 3500,
246+
RAM: 1100,
247+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 2300}},
248+
Download: 150,
249+
Upload: 150,
250250
},
251251
},
252252
usageData: testUsageData{
@@ -262,11 +262,11 @@ func TestSystemAlerts(t *testing.T) {
262262
monitoringData: aostypes.NodeMonitoring{
263263
NodeID: "testNode",
264264
NodeData: aostypes.MonitoringData{
265-
RAM: 1100,
266-
CPU: 10000,
267-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 2300}},
268-
InTraffic: 150,
269-
OutTraffic: 250,
265+
RAM: 1100,
266+
CPU: 10000,
267+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 2300}},
268+
Download: 150,
269+
Upload: 250,
270270
},
271271
},
272272
usageData: testUsageData{
@@ -285,11 +285,11 @@ func TestSystemAlerts(t *testing.T) {
285285
},
286286
monitoringData: aostypes.NodeMonitoring{
287287
NodeData: aostypes.MonitoringData{
288-
CPU: 10000,
289-
RAM: 10000,
290-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 10000}},
291-
InTraffic: 350,
292-
OutTraffic: 250,
288+
CPU: 10000,
289+
RAM: 10000,
290+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 10000}},
291+
Download: 350,
292+
Upload: 250,
293293
},
294294
},
295295
usageData: testUsageData{
@@ -448,8 +448,8 @@ func TestInstances(t *testing.T) {
448448
Disk: []aostypes.PartitionUsage{
449449
{Name: cloudprotocol.ServicesPartition, UsedSize: 2300},
450450
},
451-
InTraffic: 150,
452-
OutTraffic: 150,
451+
Download: 150,
452+
Upload: 150,
453453
},
454454
},
455455
},
@@ -523,8 +523,8 @@ func TestInstances(t *testing.T) {
523523
Disk: []aostypes.PartitionUsage{
524524
{Name: cloudprotocol.LayersPartition, UsedSize: 2300},
525525
},
526-
InTraffic: 250,
527-
OutTraffic: 150,
526+
Download: 250,
527+
Upload: 150,
528528
},
529529
},
530530
},
@@ -610,8 +610,8 @@ func TestInstances(t *testing.T) {
610610
Disk: []aostypes.PartitionUsage{
611611
{Name: cloudprotocol.ServicesPartition, UsedSize: 2300},
612612
},
613-
InTraffic: 150,
614-
OutTraffic: 250,
613+
Download: 150,
614+
Upload: 250,
615615
},
616616
},
617617
},
@@ -702,8 +702,8 @@ func TestInstances(t *testing.T) {
702702
Disk: []aostypes.PartitionUsage{
703703
{Name: cloudprotocol.StatesPartition, UsedSize: 2300},
704704
},
705-
InTraffic: 150,
706-
OutTraffic: 250,
705+
Download: 150,
706+
Upload: 250,
707707
},
708708
},
709709
},
@@ -844,11 +844,11 @@ func TestSystemAveraging(t *testing.T) {
844844
monitoringData: aostypes.NodeMonitoring{
845845
NodeID: "testNode",
846846
NodeData: aostypes.MonitoringData{
847-
CPU: 1000,
848-
RAM: 1000,
849-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 2000}},
850-
InTraffic: 100,
851-
OutTraffic: 200,
847+
CPU: 1000,
848+
RAM: 1000,
849+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 2000}},
850+
Download: 100,
851+
Upload: 200,
852852
},
853853
},
854854
},
@@ -860,11 +860,11 @@ func TestSystemAveraging(t *testing.T) {
860860
monitoringData: aostypes.NodeMonitoring{
861861
NodeID: "testNode",
862862
NodeData: aostypes.MonitoringData{
863-
CPU: 1500,
864-
RAM: 1500,
865-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 3000}},
866-
InTraffic: 150,
867-
OutTraffic: 250,
863+
CPU: 1500,
864+
RAM: 1500,
865+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 3000}},
866+
Download: 150,
867+
Upload: 250,
868868
},
869869
},
870870
},
@@ -876,11 +876,11 @@ func TestSystemAveraging(t *testing.T) {
876876
monitoringData: aostypes.NodeMonitoring{
877877
NodeID: "testNode",
878878
NodeData: aostypes.MonitoringData{
879-
CPU: 2000,
880-
RAM: 2000,
881-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 4000}},
882-
InTraffic: 200,
883-
OutTraffic: 300,
879+
CPU: 2000,
880+
RAM: 2000,
881+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 4000}},
882+
Download: 200,
883+
Upload: 300,
884884
},
885885
},
886886
},
@@ -892,11 +892,11 @@ func TestSystemAveraging(t *testing.T) {
892892
monitoringData: aostypes.NodeMonitoring{
893893
NodeID: "testNode",
894894
NodeData: aostypes.MonitoringData{
895-
CPU: 2000,
896-
RAM: 2000,
897-
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 4000}},
898-
InTraffic: 300,
899-
OutTraffic: 400,
895+
CPU: 2000,
896+
RAM: 2000,
897+
Disk: []aostypes.PartitionUsage{{Name: cloudprotocol.GenericPartition, UsedSize: 4000}},
898+
Download: 300,
899+
Upload: 400,
900900
},
901901
},
902902
},
@@ -1001,8 +1001,8 @@ func TestInstanceAveraging(t *testing.T) {
10011001
Disk: []aostypes.PartitionUsage{
10021002
{Name: cloudprotocol.ServicesPartition, UsedSize: 2000},
10031003
},
1004-
InTraffic: 100,
1005-
OutTraffic: 100,
1004+
Download: 100,
1005+
Upload: 100,
10061006
},
10071007
},
10081008
},
@@ -1042,8 +1042,8 @@ func TestInstanceAveraging(t *testing.T) {
10421042
Disk: []aostypes.PartitionUsage{
10431043
{Name: cloudprotocol.ServicesPartition, UsedSize: 2500},
10441044
},
1045-
InTraffic: 150,
1046-
OutTraffic: 150,
1045+
Download: 150,
1046+
Upload: 150,
10471047
},
10481048
},
10491049
},
@@ -1083,8 +1083,8 @@ func TestInstanceAveraging(t *testing.T) {
10831083
Disk: []aostypes.PartitionUsage{
10841084
{Name: cloudprotocol.ServicesPartition, UsedSize: 3000},
10851085
},
1086-
InTraffic: 200,
1087-
OutTraffic: 200,
1086+
Download: 200,
1087+
Upload: 200,
10881088
},
10891089
},
10901090
},
@@ -1124,8 +1124,8 @@ func TestInstanceAveraging(t *testing.T) {
11241124
Disk: []aostypes.PartitionUsage{
11251125
{Name: cloudprotocol.ServicesPartition, UsedSize: 3000},
11261126
},
1127-
InTraffic: 200,
1128-
OutTraffic: 200,
1127+
Download: 200,
1128+
Upload: 200,
11291129
},
11301130
},
11311131
},

0 commit comments

Comments
 (0)