Skip to content
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.

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

Promehetus and loki integration #52

Open
wants to merge 98 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 77 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
1db0e11
Prometheus integration
arturo-seijas Nov 11, 2024
6da12d1
Change default API passwords on install
arturo-seijas Nov 11, 2024
b4c9f3d
Change default API passwords on install
arturo-seijas Nov 11, 2024
6f9e19a
fix url
arturo-seijas Nov 11, 2024
265ce5e
fix url
arturo-seijas Nov 11, 2024
34bb88f
Random password for non admin user
arturo-seijas Nov 11, 2024
56b456b
fix linting
arturo-seijas Nov 11, 2024
32a7184
defer
arturo-seijas Nov 12, 2024
880f6cb
some comments
arturo-seijas Nov 12, 2024
e272036
make api password config mandatory
arturo-seijas Nov 12, 2024
89f02b8
Merge remote-tracking branch 'origin/main' into secure-api
arturo-seijas Nov 12, 2024
5bfea43
Merge branch 'secure-api' into promehetus-integration
arturo-seijas Nov 12, 2024
6a72018
cos integration
arturo-seijas Nov 12, 2024
a726a51
improve option description
arturo-seijas Nov 13, 2024
261a067
Do not expose API
arturo-seijas Nov 20, 2024
d025e1a
update src docs
arturo-seijas Nov 20, 2024
05f8a8e
tests
arturo-seijas Nov 20, 2024
656c5b8
Merge remote-tracking branch 'origin/main' into secure-api
arturo-seijas Nov 20, 2024
fa8cef7
fix merge
arturo-seijas Nov 20, 2024
e201000
fix stuff
arturo-seijas Nov 20, 2024
067ea29
Add pebble checks
arturo-seijas Nov 21, 2024
424e2f7
Add pebble checks
arturo-seijas Nov 21, 2024
bb1dfdf
Fix stuff
arturo-seijas Nov 21, 2024
c30fda9
Fix stuff
arturo-seijas Nov 21, 2024
b481760
Fix stuff
arturo-seijas Nov 21, 2024
514aa55
fix secret permissions
arturo-seijas Nov 21, 2024
96d28c0
fix secret permissions
arturo-seijas Nov 21, 2024
dc1af35
fix secret permissions
arturo-seijas Nov 21, 2024
561f825
increasse timeouts
arturo-seijas Nov 21, 2024
b89462e
Change only this user
arturo-seijas Nov 21, 2024
3094162
Increase timeouts
arturo-seijas Nov 22, 2024
9336ff1
Increase timeouts
arturo-seijas Nov 22, 2024
4104fcb
Increase timeouts
arturo-seijas Nov 22, 2024
7b454ea
fix authentication
arturo-seijas Nov 22, 2024
7d3e5a2
fix authentication
arturo-seijas Nov 22, 2024
f0932fd
fix authentication
arturo-seijas Nov 22, 2024
bf1b905
fix authentication
arturo-seijas Nov 22, 2024
18d9293
debug
arturo-seijas Nov 22, 2024
3d0cd9b
increase timeouts
arturo-seijas Nov 25, 2024
5ddb096
Fix password change
arturo-seijas Nov 25, 2024
bf91a5d
do not use self hosted runners
arturo-seijas Nov 25, 2024
9a122b2
Revert "do not use self hosted runners"
arturo-seijas Nov 25, 2024
998bd10
Fix password change
arturo-seijas Nov 25, 2024
810f242
Fix requests
arturo-seijas Nov 26, 2024
4460c75
Just change wazuh user
arturo-seijas Nov 26, 2024
040db1d
fix user 2 password change
arturo-seijas Nov 26, 2024
f2033f5
src docs
arturo-seijas Nov 26, 2024
3e4a905
fix integ test and improve checks
arturo-seijas Nov 26, 2024
47ce024
Merge branch 'secure-api' into promehetus-integration
arturo-seijas Nov 26, 2024
1e7f8a4
Authenticate
arturo-seijas Nov 26, 2024
cfcefb4
Add rules
arturo-seijas Nov 26, 2024
c40b8a5
Fix trivy config
arturo-seijas Nov 26, 2024
04f4ccd
Consider error reponses when authenticating
arturo-seijas Nov 27, 2024
e14a871
Consider error reponses when authenticating
arturo-seijas Nov 27, 2024
e4069fc
Consider error reponses when authenticating
arturo-seijas Nov 27, 2024
35e1a32
Consider error reponses when authenticating
arturo-seijas Nov 27, 2024
28bf8fc
Check response content
arturo-seijas Nov 27, 2024
b24e8fd
Check response content
arturo-seijas Nov 27, 2024
038ce2b
Refactor
arturo-seijas Nov 27, 2024
ff3fbe4
Improve logs
arturo-seijas Nov 27, 2024
ec8d38d
Use valid password
arturo-seijas Nov 27, 2024
a35cf84
Use valid password
arturo-seijas Nov 27, 2024
0fbe216
Use valid password
arturo-seijas Nov 27, 2024
9d2be49
improve tests
arturo-seijas Nov 27, 2024
238f8a0
Let the charm generate the random passwords
arturo-seijas Dec 2, 2024
5a80139
Improve stuff
arturo-seijas Dec 2, 2024
dd2e03e
more tests
arturo-seijas Dec 2, 2024
52bdd2d
fix integration tests
arturo-seijas Dec 2, 2024
44085aa
Merge branch 'secure-api' into promehetus-integration
arturo-seijas Dec 2, 2024
d05add9
Merge remote-tracking branch 'origin/main' into promehetus-integration
arturo-seijas Dec 3, 2024
cf837e1
fix license config
arturo-seijas Dec 3, 2024
2a41ab4
debug
arturo-seijas Dec 3, 2024
c9c6585
fix docs
arturo-seijas Dec 3, 2024
60dcb4c
Add methods for creating readonly users
arturo-seijas Dec 4, 2024
732cc4b
Improve user management
arturo-seijas Dec 4, 2024
5a5a7a6
Merge branch 'main' into promehetus-integration
arturo-seijas Dec 4, 2024
58124b9
Fix prometheus exporter installation
arturo-seijas Dec 5, 2024
fe9e3ad
Fix rockcraft
arturo-seijas Dec 5, 2024
7b89983
debug
arturo-seijas Dec 5, 2024
db02dbd
Fix password change
arturo-seijas Dec 5, 2024
0377cee
Fix password change
arturo-seijas Dec 5, 2024
6929327
Fix password change
arturo-seijas Dec 5, 2024
c3bae53
Fix integration tests
arturo-seijas Dec 5, 2024
9d761a5
Merge remote-tracking branch 'origin/main' into promehetus-integration
arturo-seijas Dec 5, 2024
0e073d8
More logs
arturo-seijas Dec 10, 2024
adff934
fix error in initial plan
arturo-seijas Dec 10, 2024
72da8d6
fix error in initial plan
arturo-seijas Dec 10, 2024
44e4d06
Merge branch 'main' into promehetus-integration
arturo-seijas Dec 10, 2024
8cdfc5f
Fix error retrieving users
arturo-seijas Dec 10, 2024
7ded152
add docs
arturo-seijas Dec 10, 2024
c6b1a00
Fix password change for wazuh-wui user
arturo-seijas Dec 10, 2024
5583281
fix linting
arturo-seijas Dec 10, 2024
2cc7925
Fix logs
arturo-seijas Dec 11, 2024
9698989
Wait patiently
arturo-seijas Dec 11, 2024
fc1d6be
fix linting
arturo-seijas Dec 11, 2024
cd706fa
Increase patience
arturo-seijas Dec 11, 2024
1d791ea
Fix auth
arturo-seijas Dec 11, 2024
f0f1048
Merge branch 'main' into promehetus-integration
arturo-seijas 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
1 change: 1 addition & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ header:
- '.trivyignore'
- 'zap_rules.tsv'
- 'lib/**'
- 'src/prometheus_alert_rules/**'
- 'tests/unit/resources/**'
comment: on-failure
15 changes: 12 additions & 3 deletions charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,25 @@ resources:
wazuh-server-image:
type: oci-image
description: OCI image for the Wazuh server
provides:
grafana-dashboard:
interface: grafana_dashboard
metrics-endpoint:
interface: prometheus_scrape
requires:
certificates:
interface: tls-certificates
limit: 1
opensearch-client:
interface: opensearch_client
limit: 1
ingress:
interface: traefik_route
limit: 1
logging:
interface: loki_push_api
limit: 1
optional: true

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this optional tag can go away :D

opensearch-client:
interface: opensearch_client
limit: 1
config:
options:
agent-password:
Expand Down
Loading
Loading