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

Integrate EL monitoring stack #406

Merged
merged 57 commits into from
Sep 17, 2024
Merged

Integrate EL monitoring stack #406

merged 57 commits into from
Sep 17, 2024

Conversation

khalifaa55
Copy link
Contributor

Changes:

  • Integrate monitoring stack code from EL repo

Types of changes

What types of changes does your code introduce?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Other (please describe):

Testing

Requires testing

  • Yes
  • No

In case you checked yes, did you write tests?

  • Yes
  • No

@AntiD2ta AntiD2ta added enhancement New feature or request main High priority labels Sep 5, 2024
@khalifaa55
Copy link
Contributor Author

khalifaa55 commented Sep 5, 2024

Main Changes

  • Merged dockerManager interface from EL repo with serviceManager interface from Sedge into dockerServiceManager.

  • Adjust code for composeManager from EL to use code from CommandRunner implementation. composeManager in EL.

  • Include monitoring package in internal/monitoring which has all packages needed by the monitoringStack from EL .

  • Generate mocks needed by the new packages in internal/monitoring into sedge_mocks package, except for internal/monitoring/locker/lock.go mocks are generated in internal/monitoring/locker/mocks (to prevent import cycles).

  • Adjust file handling in test cases (in monitoring package) using PathMatcher to work with Windows as well as Linux OS.

  • Remove unneeded code from internal/monitoring/data package (package in EL repo)

  • Skip e2e tests in unit-tests workflow in CI/CD pipeline (updated Makefile and unit-tests.yml)

@codecov-commenter
Copy link

codecov-commenter commented Sep 5, 2024

Codecov Report

Attention: Patch coverage is 92.06030% with 79 lines in your changes missing coverage. Please review.

Project coverage is 88.06%. Comparing base (ea6586f) to head (178116a).

Files with missing lines Patch % Lines
internal/pkg/services/docker.go 89.71% 21 Missing and 8 partials ⚠️
internal/compose/compose.go 78.68% 13 Missing ⚠️
...ernal/monitoring/services/node_exporter/service.go 55.55% 10 Missing and 2 partials ⚠️
internal/monitoring/services/grafana/service.go 89.04% 6 Missing and 2 partials ⚠️
internal/monitoring/services/prometheus/service.go 93.57% 4 Missing and 3 partials ⚠️
internal/monitoring/monitoring.go 97.29% 2 Missing and 2 partials ⚠️
cli/monitoring.go 95.83% 1 Missing and 1 partial ⚠️
internal/monitoring/data/datadir.go 93.93% 2 Missing ⚠️
internal/monitoring/services/types/types.go 50.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #406      +/-   ##
===========================================
+ Coverage    87.47%   88.06%   +0.59%     
===========================================
  Files           92       99       +7     
  Lines         4774     5673     +899     
===========================================
+ Hits          4176     4996     +820     
- Misses         492      553      +61     
- Partials       106      124      +18     
Flag Coverage Δ
unittests 88.06% <92.06%> (+0.59%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@khalifaa55 khalifaa55 force-pushed the feat/monitoring-stack branch 3 times, most recently from f6434aa to 770fe16 Compare September 12, 2024 12:28
@khalifaa55 khalifaa55 marked this pull request as ready for review September 13, 2024 12:33
@AntiD2ta AntiD2ta mentioned this pull request Sep 15, 2024
12 tasks
CHANGELOG.md Outdated Show resolved Hide resolved
internal/monitoring/services/grafana/service_test.go Outdated Show resolved Hide resolved
cli/monitoringManager.go Outdated Show resolved Hide resolved
cli/monitoringManager.go Outdated Show resolved Hide resolved
cli/monitoring.go Outdated Show resolved Hide resolved
cli/monitoring_test.go Show resolved Hide resolved
go.mod Show resolved Hide resolved
internal/monitoring/compose/compose.go Outdated Show resolved Hide resolved
internal/monitoring/data/datadir.go Outdated Show resolved Hide resolved
internal/monitoring/locker/lock.go Show resolved Hide resolved
Copy link
Member

@AntiD2ta AntiD2ta left a comment

Choose a reason for hiding this comment

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

Approved! Terrific job @khalifaa55 !

@khalifaa55 khalifaa55 merged commit 000cc79 into develop Sep 17, 2024
10 checks passed
@khalifaa55 khalifaa55 deleted the feat/monitoring-stack branch September 17, 2024 09:25
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request main High priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants