Fix #310 / #307

[mrfroggg]

No description provided.

[mrfroggg]

Dict merge will overwrite duplicate keys with last element:

a = {'a': 1, 'b': 2, 'c': 3}
b = {'c': 33, 'd': 44}
{**a, **b}
Out[4]: {'a': 1, 'b': 2, 'c': 33, 'd': 44}

[ferozsalam]

As we have Python 3.9 in the project, it might be neater to write this like:

template_values = self.match | self.rule

And then use the template_values where required.

[mrfroggg]

As we have Python 3.9 in the project, it might be neater to write this like:

template_values = self.match | self.rule

And then use the template_values where required.

Oh, I never used | before, I'll update my PR!

[mrfroggg]

Updated the PR and added test for alert_text_jinja

[jertel]

Nice work, thank you!