beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add -a options in cscli alerts list (#1690)

Browse source 
* Add -a options in cscli alerts list
This commit is contained in:
AlteredCoder 2022-07-28 17:31:53 +02:00 committed by GitHub
parent 866c200c31
commit 16b1ab06a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/crowdsec-cli/alerts.go
View file

@ -231,6 +231,7 @@ func NewAlertsCmd() *cobra.Command {
Since: new(string), Since: new(string),
Until: new(string), Until: new(string),
TypeEquals: new(string), TypeEquals: new(string),
IncludeCAPI: new(bool),
} }
limit = new(int) limit = new(int)
contained := new(bool) contained := new(bool)
@ -283,6 +284,11 @@ cscli alerts list --type ban`,
*alertListFilter.Since = fmt.Sprintf("%d%s", days*24, "h") *alertListFilter.Since = fmt.Sprintf("%d%s", days*24, "h")
} }
} }
if *alertListFilter.IncludeCAPI {
*alertListFilter.Limit = 0
}
if *alertListFilter.TypeEquals == "" { if *alertListFilter.TypeEquals == "" {
alertListFilter.TypeEquals = nil alertListFilter.TypeEquals = nil
} }
@ -316,6 +322,7 @@ cscli alerts list --type ban`,
}, },
} }
cmdAlertsList.Flags().SortFlags = false cmdAlertsList.Flags().SortFlags = false
cmdAlertsList.Flags().BoolVarP(alertListFilter.IncludeCAPI, "all", "a", false, "Include decisions from Central API")
cmdAlertsList.Flags().StringVar(alertListFilter.Until, "until", "", "restrict to alerts older than until (ie. 4h, 30d)") cmdAlertsList.Flags().StringVar(alertListFilter.Until, "until", "", "restrict to alerts older than until (ie. 4h, 30d)")
cmdAlertsList.Flags().StringVar(alertListFilter.Since, "since", "", "restrict to alerts newer than since (ie. 4h, 30d)") cmdAlertsList.Flags().StringVar(alertListFilter.Since, "since", "", "restrict to alerts newer than since (ie. 4h, 30d)")
cmdAlertsList.Flags().StringVarP(alertListFilter.IPEquals, "ip", "i", "", "restrict to alerts from this source ip (shorthand for --scope ip --value <IP>)") cmdAlertsList.Flags().StringVarP(alertListFilter.IPEquals, "ip", "i", "", "restrict to alerts from this source ip (shorthand for --scope ip --value <IP>)")

2
tests/bats/01_base.bats
View file

@ -73,7 +73,7 @@ declare stderr
@test "cscli alerts list: at startup returns at least one entry: community pull" { @test "cscli alerts list: at startup returns at least one entry: community pull" {
is_db_postgres && skip is_db_postgres && skip
# it should have been received while preparing the fixture # it should have been received while preparing the fixture
run -0 cscli alerts list -o json run -0 cscli alerts list -a -o json
run -0 jq -r '. | length' <(output) run -0 jq -r '. | length' <(output)
refute_output 0 refute_output 0

2
tests/lib/config/config-global
View file

@ -65,7 +65,7 @@ make_init_data() {
sleep 2 sleep 2
[[ $("${CSCLI}" alerts list -o json) != "null" ]] && break [[ $("${CSCLI}" alerts list -o json) != "null" ]] && break
done done
[[ $("${CSCLI}" alerts list -o json) != "null" ]] || die "could not get community data" [[ $("${CSCLI}" alerts list -a -o json) != "null" ]] || die "could not get community data"
"${TEST_DIR}/instance-crowdsec" stop "${TEST_DIR}/instance-crowdsec" stop

2
tests/lib/config/config-local
View file

@ -114,7 +114,7 @@ make_init_data() {
sleep 2 sleep 2
[[ $("${CSCLI}" alerts list -o json) != "null" ]] && break [[ $("${CSCLI}" alerts list -o json) != "null" ]] && break
done done
[[ $("${CSCLI}" alerts list -o json) != "null" ]] || die "could not get community data" [[ $("${CSCLI}" alerts list -a -o json) != "null" ]] || die "could not get community data"
"${TEST_DIR}/instance-crowdsec" stop "${TEST_DIR}/instance-crowdsec" stop