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

(PoC) EmailSender #8376

Closed
wants to merge 37 commits into from
Closed

(PoC) EmailSender #8376

wants to merge 37 commits into from

Commits on Jun 14, 2024

  1. copy stuff over from Grafana, make sure it compiles

    @santihernandezc
    santihernandezc committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ad56e77 View commit details
    Browse the repository at this point in the history

  2. it sends emails

    @santihernandezc
    santihernandezc committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    9367184 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. use global config for configuring grafana email receivers

    @santihernandezc
    santihernandezc committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    f5d3d09 View commit details
    Browse the repository at this point in the history

  2. remove unnecessary template data, remove content types, remove StartT… 

    …LSPolicy, use globals from Mimir config, test parsing templates
    @santihernandezc
    santihernandezc committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    3bfef87 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. add default email

    @santihernandezc
    santihernandezc committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    289e425 View commit details
    Browse the repository at this point in the history

  2. use email sender from alerting repository

    @santihernandezc
    santihernandezc committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1405231 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. use email sender in alerting repo

    @santihernandezc
    santihernandezc committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    c14d992 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. update alerting version

    @santihernandezc
    santihernandezc committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    82fb12f View commit details
    Browse the repository at this point in the history

  2. remove default email template

    @santihernandezc
    santihernandezc committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    7f7c875 View commit details
    Browse the repository at this point in the history

  3. make buildIntegrationsMap a method in the Alertmanager struct

    @santihernandezc
    santihernandezc committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    354b2ec View commit details
    Browse the repository at this point in the history

  4. fix typo, delete unused struct

    @santihernandezc
    santihernandezc committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    55ab4a7 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. update grafana/alerting to latest main

    @santihernandezc
    santihernandezc committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    196a5ad View commit details
    Browse the repository at this point in the history

  2. Alertmanager: Add default Grafana template string

    @santihernandezc
    santihernandezc committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    4acbf95 View commit details
    Browse the repository at this point in the history

  3. user userID from am.cfg

    @santihernandezc
    santihernandezc committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8f57ae9 View commit details
    Browse the repository at this point in the history

  4. Alertmanager: Use the Alertmanager's userID in ApplyConfig

    @santihernandezc
    santihernandezc committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c39d12d View commit details
    Browse the repository at this point in the history

  5. add separate grafana template struct

    @santihernandezc
    santihernandezc committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    7ede8f8 View commit details
    Browse the repository at this point in the history

  6. create the Grafana template struct only if needed

    @santihernandezc
    santihernandezc committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    1841732 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    464bef2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'santihernandezc/apply_config_use_user_id_from_alertmana… 

    …ger_state' of https://github.com/grafana/mimir into santihernandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    b9014ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'santihernandezc/include_default_templates' of https://g… 

    …ithub.com/grafana/mimir into santihernandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    5ea1617 View commit details
    Browse the repository at this point in the history

  4. prevent panics due to nil ExternalURL

    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    5b4a0a5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'santihernandezc/include_default_templates' of https://g… 

    …ithub.com/grafana/mimir into santihernandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    187c132 View commit details
    Browse the repository at this point in the history

  6. (WIP) Add Grafana's external URL

    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    433a8c2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'santihernandezc/include_external_url_in_grafana_config'… 

    … of https://github.com/grafana/mimir into santihernandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    03b8303 View commit details
    Browse the repository at this point in the history

  8. add external URL for Grafana

    @santihernandezc
    santihernandezc committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    78487d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    d89e2e8 View commit details
    Browse the repository at this point in the history

  2. don't parse Grafana templates in Mimir tmpl struct

    @santihernandezc
    santihernandezc committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    5b4f5b1 View commit details
    Browse the repository at this point in the history

  3. Alertmanager: Use the default email sender for Grafana receivers

    @santihernandezc
    santihernandezc committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    841317a View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/use_default_email_sender
    @santihernandezc
    santihernandezc committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    549dd28 View commit details
    Browse the repository at this point in the history

  2. tests, fix mimir global config not being used in Grafana

    @santihernandezc
    santihernandezc committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    12c35f1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/use_default_email_sender
    @santihernandezc
    santihernandezc committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ce68128 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    eca729b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'santihernandezc/use_default_email_sender' of https://gi… 

    …thub.com/grafana/mimir into santihernandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    580f0c1 View commit details
    Browse the repository at this point in the history

  6. format

    @santihernandezc
    santihernandezc committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    d32068d View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    4d26455 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'main' of https://github.com/grafana/mimir into santiher… 

    …nandezc/poc_email_sender
    @santihernandezc
    santihernandezc committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e96abad View commit details
    Browse the repository at this point in the history

  2. remove diff in non-config files

    @santihernandezc
    santihernandezc committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    88450b3 View commit details
    Browse the repository at this point in the history