Skip to content

Properly convert bytes to real bytes, using 1024 basis (AB#18742) #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 12, 2024
Merged

Properly convert bytes to real bytes, using 1024 basis (AB#18742) #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02901c0
use proper bytes in pixiu
wpoely86 Aug 23, 2024
d3576c5
fix tests
wpoely86 Dec 11, 2024
1f0ef21
more test fixes
wpoely86 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions tests/data/pixiu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ data = [
"alarm_severity": "Major",
"alarm_object": "OceanStor-Distributed-Storage",
"alarm_id": "0xFEA6A000B",
"used_space": 1024000000,
"used_space": 1073741824,
"quota_used_type": "space",
"quota_type": "directory",
"dtree": "test1",
"dtree_id": 4101,
"namespace": "admin",
"namespace_id": 71,
"quota_limit_type": "hard",
"quota_space_limit": 1024000000,
"quota_space_limit": 1073741824,
"path": "/",
},
},
Expand All @@ -187,7 +187,7 @@ data = [
"alarm_severity": "Warning",
"alarm_object": "OceanStor-Distributed-Storage",
"alarm_id": "0xFEA6A000F",
"used_space": 8191000000,
"used_space": 8588886016,
"quota_used_type": "space",
"quota_type": "user",
"username": "vsc10042",
Expand All @@ -196,7 +196,7 @@ data = [
"namespace": "user",
"namespace_id": 70,
"quota_limit_type": "soft",
"quota_space_limit": 6144000000,
"quota_space_limit": 6442450944,
"path": "/100",
},
},
Expand All @@ -208,7 +208,7 @@ data = [
"alarm_severity": "Warning",
"alarm_object": "OceanStor-Distributed-Storage",
"alarm_id": "0xFEA6A0011",
"used_space": 8192000000,
"used_space": 8589934592,
"quota_used_type": "space",
"quota_type": "user",
"username": "vsc10042",
Expand All @@ -217,7 +217,7 @@ data = [
"namespace": "user",
"namespace_id": 70,
"quota_limit_type": "hard",
"quota_space_limit": 8192000000,
"quota_space_limit": 8589934592,
"path": "/100",
},
},
Expand Down Expand Up @@ -269,11 +269,11 @@ data = [
"namespace_id": 242,
"dtree": "--",
"dtree_id": 0,
"used_space": 18000000,
"used_space": 18874368,
"quota_used_type": "space",
"quota_type": "directory",
"quota_limit_type": "soft",
"quota_space_limit": 15000000,
"quota_space_limit": 15728640,
"path": "/",
},
},
Expand All @@ -286,11 +286,11 @@ data = [
"namespace_id": 182,
"dtree": "--",
"dtree_id": 0,
"used_space": 8388608000000,
"used_space": 8796093022208,
"quota_used_type": "space",
"quota_type": "directory",
"quota_limit_type": "hard",
"quota_space_limit": 8388608000000,
"quota_space_limit": 8796093022208,
"path": "/",
},
},
Expand Down Expand Up @@ -340,8 +340,8 @@ data = [
"namespace_id": 70,
"quota_limit_type": "soft",
"path": "/110",
"quota_space_limit": 5851000000,
"used_space": 6108000000,
"quota_space_limit": 6135218176,
"used_space": 6404702208,
},
},
{
Expand Down Expand Up @@ -427,11 +427,11 @@ data = [
"namespace_id": 592,
"dtree": "--",
"dtree_id": 0,
"used_space": 10000,
"used_space": 10240,
"quota_used_type": "space",
"quota_type": "directory",
"quota_limit_type": "hard",
"quota_space_limit": 10000,
"quota_space_limit": 10240,
"path": "/",
},
},
Expand Down
14 changes: 10 additions & 4 deletions tests/logstash_7.6.2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,16 @@ filter {
}
}

if ("_grokparsefailure" not in [tags]) {
mutate {
remove_field => [ "syslog_hostname", "syslog_message", "syslog_timestamp", "KEY_EQ_VALUEDATA" ]
}
if "_grokparsefailure" not in [tags] {
mutate {
# in the future remove the field 'message' too
remove_field => [ "syslog_hostname", "syslog_message", "syslog_timestamp", "KEY_EQ_VALUEDATA", "int" ]
convert => { "success" => "boolean" }

# we need MB converted to MiB for bytes2human
gsub => [ "used_space", "([0-9]+[kKmMgGtTpP])[bB]", "\1ib",
"quota_space_limit", "([0-9]+[kKmMgGtTpP])[bB]", "\1ib" ]
}
}

if [jube_id] {
Expand Down
Loading