Network-interfaces function small improvements (#16336)
* net int stats small improvements * rename field Name to Interface
Ilya Mashchenko committed
Nov 5, 2023 at 12:42 UTC
d832898243ad4c1a2b1a541d899bf85a21f34c17
1 file changed
+36
-2
collectors/proc.plugin/proc_net_dev.c
+36
-2
@@ -722,6 +722,12 @@ int netdev_function_net_interfaces(BUFFER *wb, int timeout __maybe_unused, const
722
}
723
buffer_json_add_array_item_double(wb, drops_tx);
724
725
+ buffer_json_add_array_item_object(wb);
726
+ {
727
+ buffer_json_member_add_string(wb, "severity", drops_rx + drops_tx > 0 ? "warning" : "normal");
728
+ }
729
+ buffer_json_object_close(wb);
730
+
731
buffer_json_array_close(wb);
732
}
733
@@ -732,7 +738,7 @@ int netdev_function_net_interfaces(BUFFER *wb, int timeout __maybe_unused, const
738
{
739
size_t field_id = 0;
740
735
- buffer_rrdf_table_add_field(wb, field_id++, "Name", "Network Interface Name",
741
+ buffer_rrdf_table_add_field(wb, field_id++, "Interface", "Network Interface Name",
742
RRDF_FIELD_TYPE_STRING, RRDF_FIELD_VISUAL_VALUE, RRDF_FIELD_TRANSFORM_NONE,
743
0, NULL, NAN, RRDF_FIELD_SORT_ASCENDING, NULL,
744
RRDF_FIELD_SUMMARY_COUNT, RRDF_FIELD_FILTER_MULTISELECT,
@@ -836,6 +842,19 @@ int netdev_function_net_interfaces(BUFFER *wb, int timeout __maybe_unused, const
842
RRDF_FIELD_SUMMARY_SUM, RRDF_FIELD_FILTER_NONE,
843
RRDF_FIELD_OPTS_VISIBLE,
844
NULL);
845
+
846
+ buffer_rrdf_table_add_field(
847
+ wb, field_id++,
848
+ "rowOptions", "rowOptions",
849
+ RRDF_FIELD_TYPE_NONE,
850
+ RRDR_FIELD_VISUAL_ROW_OPTIONS,
851
+ RRDF_FIELD_TRANSFORM_NONE, 0, NULL, NAN,
852
+ RRDF_FIELD_SORT_FIXED,
853
+ NULL,
854
+ RRDF_FIELD_SUMMARY_COUNT,
855
+ RRDF_FIELD_FILTER_NONE,
856
+ RRDF_FIELD_OPTS_DUMMY,
857
+ NULL);
858
}
859
860
buffer_json_object_close(wb); // columns
@@ -875,7 +894,7 @@ int netdev_function_net_interfaces(BUFFER *wb, int timeout __maybe_unused, const
894
{
895
buffer_json_add_array_item_array(wb);
896
buffer_json_add_array_item_string(wb, "Traffic");
878
- buffer_json_add_array_item_string(wb, "Name");
897
+ buffer_json_add_array_item_string(wb, "Interface");
898
buffer_json_array_close(wb);
899
900
buffer_json_add_array_item_array(wb);
@@ -885,6 +904,21 @@ int netdev_function_net_interfaces(BUFFER *wb, int timeout __maybe_unused, const
904
}
905
buffer_json_array_close(wb);
906
907
+ buffer_json_member_add_object(wb, "group_by");
908
+ {
909
+ buffer_json_member_add_object(wb, "Type");
910
+ {
911
+ buffer_json_member_add_string(wb, "name", "Type");
912
+ buffer_json_member_add_array(wb, "columns");
913
+ {
914
+ buffer_json_add_array_item_string(wb, "Type");
915
+ }
916
+ buffer_json_array_close(wb);
917
+ }
918
+ buffer_json_object_close(wb);
919
+ }
920
+ buffer_json_object_close(wb); // group_by
921
+
922
buffer_json_member_add_time_t(wb, "expires", now_realtime_sec() + 1);
923
buffer_json_finalize(wb);
924