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.

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

Jump to bottom

Schedule Reports #3510

Merged
merged 273 commits into from
Oct 1, 2024
Merged

Schedule Reports #3510

merged 273 commits into from
Oct 1, 2024

Conversation

Rieven
Copy link
Contributor

@Rieven Rieven commented Sep 10, 2024 •
edited
Loading

Changes

  • Added form to schedule reports
  • Added backend functionality to schedule reports in the scheduler @jpbruinsslot
  • Show form at final settings just before you generate report

TO DO in base branch feature/report-recipe

Depends on:

  • Task runner for schedule reports @Donnype

Upcoming features:

  • Show report schedules in a list
  • Change schedules

Issue link

#3088
#2779

Closes #3088
Closes #2779

Demo

Screen.Recording.2024-09-26.at.15.48.55.mov

QA notes

See video for testing.

Code Checklist

  • All the commits in this PR are properly PGP-signed and verified.
  • This PR only contains functionality relevant to the issue.
  • I have written unit tests for the changes or fixes I made.
  • I have checked the documentation and made changes where necessary.
  • I have performed a self-review of my code and refactored it to the best of my abilities.
  • Tickets have been created for newly discovered issues.
  • For any non-trivial functionality, I have added integration and/or end-to-end tests.
  • I have informed others of any required .env changes files if required and changed the .env-dist accordingly.
  • I have included comments in the code to elaborate on what is not self-evident from the code itself, including references to issues and discussions online, or implicit behavior of an interface.

Checklist for code reviewers:

Copy-paste the checklist from the docs/source/templates folder into your comment.

Checklist for QA:

Copy-paste the checklist from the docs/source/templates folder into your comment.

@jpbruinsslot
Update documentation
01e01c5
@jpbruinsslot
Update docs and restructure some code
44e415f
@jpbruinsslot
Fix diagram010.svg
8968abe
@jpbruinsslot
Fix
86db29b
@jpbruinsslot
Merge branch 'main' into chore/mula/update-architecture-doc
04995f7 
* main:
  Fix/394 Introduce clearance level control for objects imported by CSV (#2390)
  Update RabbitMQ to the latest version (#2392)
  Show created at and data from in reports (#2370)
  Rename invalid rpki finding to expired (#2377)
  Convert `docker-compose` to `docker compose` (#2341)
  Remove uWSGI (#2366)
  Prevent double github actions (#2374)
@jpbruinsslot
Merge branch 'main' into feature/mula/flexible-scheduling
e76dc69 
* main:
  Fix/394 Introduce clearance level control for objects imported by CSV (#2390)
  Update RabbitMQ to the latest version (#2392)
  Show created at and data from in reports (#2370)
  Rename invalid rpki finding to expired (#2377)
  Convert `docker-compose` to `docker compose` (#2341)
  Remove uWSGI (#2366)
  Prevent double github actions (#2374)
  Fix WEASYPRINT_BASEURL default value and change ports in docker-compose.yml (#2373)
  Remove debian11 packages (#2358)
  Error handling for Generate Report (#2274)
  Update dependencies (#2348)
  Add token authentication (#2349)
  Adds CAA records to the model, boefje, normalizer, adds a check bit and a finding (#2315)
  Check for sudo in install and update script (#2360)
  Feat/normalizer mimetype upload deeplink (#2220)
  Add hrefs to Basic Security overview (#2330)
  Render dicts and list ooi attrs as jsonfield (#2355)
@jpbruinsslot
Merge branch 'chore/mula/update-architecture-doc' into feature/mula/f…
2a7693b 
…lexible-scheduling

* chore/mula/update-architecture-doc:
  Fix
  Fix diagram010.svg
  Update docs and restructure some code
  Update documentation
  Add diagrams
  Update architecture documentation
@jpbruinsslot
Update docs
a9cd630
@jpbruinsslot
Update documentation
4416704
@jpbruinsslot
Refactor naming
e12c0ee
@jpbruinsslot
Update docs
97b0350
@jpbruinsslot
Merge branch 'main' into feature/mula/flexible-scheduling
85777ea 
* main: (85 commits)
  Fix wrong solving of merge conflict (#2585)
  Add metrics collection for scheduler using prometheus (#2468)
  Hotfix for where_in queries for abstract types (#2577)
  Update django (#2587)
  Fix octopoes typing (#2555)
  Create findings report (#2393)
  Raise exception if boefje input OOI has been deleted (#2573)
  Set a timeout on hanging test ssl container (#2560)
  Feature/efficient reporting (#2516)
  Updated findings database. Removed old findings, added Impact, Source… (#2569)
  add unit test for web report (#2528)
  Add pool size config and logs (#2541)
  Quick fix for PDF table overflow (#2562)
  Fix/2527 octopoes unicode (#2558)
  Add return typing to report test fixtures (#2557)
  Sort vulnerabilities in vulnerability report (#2378)
  Disable ruff split-on-trailing-comma and update ruff (#2544)
  Select all oois triggers toggle all (#2536)
  Remove unnecessary toplevel dependencies (#2554)
  Make valid time required parameter in the octopoes API (#2543)
  ...
@jpbruinsslot
First round of git pre-commit
245ca61
@jpbruinsslot
Fix mypy suggestions
2838b45
@jpbruinsslot
Restructure of models
5b2bda7
@jpbruinsslot
Continue implementing data deduplication fixes
1175452
@jpbruinsslot
Refactoring
c29a747
@jpbruinsslot
Fixing sqlalchemy nested, removing TaskSchedule
47466a0
@jpbruinsslot
Continue refactoring
a82c344
@jpbruinsslot
Refactor filtering
4cfbbcb
@jpbruinsslot
Continue with nested queries
5f9b2bf
@jpbruinsslot
Fix filtering with relationship
a58a69f
@jpbruinsslot
Fix tests for updated filters
be79fc6
@jpbruinsslot
Testing out queue refactor
b54bdf8
@jpbruinsslot
Alternative keeping PrioritizedItem present
4e98e6c
@jpbruinsslot
Make priority queue test work
e25d1f7
@jpbruinsslot
Update scheduler.py
fd29038
@jpbruinsslot
Update scheduler.py testing
ff94126
@jpbruinsslot
Going through test_scheduler.py
57f30f1
@jpbruinsslot
Clean ups
0fa1a55
@Rieven Rieven marked this pull request as ready for review September 18, 2024 14:30
@Rieven Rieven requested a review from a team as a code owner September 18, 2024 14:30
@CLAassistant
Copy link

CLAassistant commented Sep 23, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@jpbruinsslot
Copy link
Contributor

jpbruinsslot commented Sep 24, 2024 •
edited
Loading

@Rieven do you need some help with resolving the merger? Seems both branches are somewhat out of sync. What is specifically the ordering, this branch into feature/report-recipe or does this branch need to be merged into main?

@Rieven
Copy link
Contributor Author

Rieven commented Sep 26, 2024

@Rieven do you need some help with resolving the merger? Seems both branches are somewhat out of sync. What is specifically the ordering, this branch into feature/report-recipe or does this branch need to be merged into main?

first merge with feature/report-recipe and then everything to main.

@Rieven Rieven mentioned this pull request Sep 30, 2024
Merged
9 tasks
@underdarknl underdarknl merged commit 862f6f3 into feature/report-recipe Oct 1, 2024
10 checks passed
@underdarknl underdarknl deleted the feature/schedule-report branch October 1, 2024 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpbruinsslot jpbruinsslot jpbruinsslot left review comments

Assignees

@jpbruinsslot jpbruinsslot

@Rieven Rieven

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Rieven @CLAassistant @jpbruinsslot @underdarknl @ammar92