ad7c5bc997
IcingaHost: fix tests
2016-10-25 00:30:12 +00:00
d804ebb321
Merge branch 'feature/nested-apply-rules-12033'
2016-10-25 00:02:22 +00:00
39be7b2cb0
IcingaObjectLegacyAssignments: rendering for old...
...
...assignments still to be found in our activity log
2016-10-25 00:00:16 +00:00
6e83a4fd5b
IcingaObjectGroup: provide groups for assign rules
2016-10-24 21:55:02 +00:00
b3eb5ea102
IcingaServiceTable: Update apply rule rendering
...
For new storage format, and change to table.
refs #12033
2016-10-24 14:43:52 +02:00
0d86c24cd8
Huge change, getting rid of legacy assignment...
...
...code. All objects should work with the new code base right now
2016-10-24 03:41:37 +00:00
3ff6fd5211
schema/mysql: migrate all remaining assignments
2016-10-24 03:19:18 +00:00
aeafec37d7
FormDataFilter: simplify HTML, Code and style
2016-10-23 04:23:38 +00:00
24478ede12
DataFilter: json_en/decode when passing to form
2016-10-23 03:14:52 +00:00
9d8cc13dca
schema/mysql: use higher migration number
2016-10-22 16:16:23 +00:00
88a741a8d0
IcingaService: introduce assign_filter property
2016-10-22 07:02:09 +00:00
8f2b9fea07
DataFilter: automagic fix for not(multiple)
2016-10-22 07:02:09 +00:00
6ed24f93da
IcingaObject: render assign_filter property
2016-10-22 07:02:09 +00:00
0a6514928a
AssignRenderer: add renderEquals method...
...
...with (hopefully temporarily) hardcoded groups support
2016-10-22 07:02:09 +00:00
8519a287dc
FormDataFilter: flip button order
2016-10-22 07:02:09 +00:00
a819e7c92c
DataFilter: attribs are no longer needed
2016-10-22 07:02:09 +00:00
3fbf3e9115
IcingaServiceForm: use new assign_filter property
2016-10-22 07:02:09 +00:00
78a380811f
schema/mysql: simplify apply rules
2016-10-22 07:02:09 +00:00
8ade496fdc
DataFilter: refactor the whole class(es)
2016-10-22 07:02:09 +00:00
037c588d26
FormDataFilter: change icon for expression
2016-10-22 07:02:09 +00:00
7756736006
css: adjust styles, fix nesting
2016-10-22 07:02:09 +00:00
8439cc8e30
css: style new nested filter elements...
...
...and assign rules
2016-10-22 07:02:09 +00:00
9349ba0f2a
FormDataFilter: new implementation for assignments
...
First prototype
2016-10-22 07:02:09 +00:00
a735df89a0
Merge branch 'feature/assign-for-11976'
2016-10-22 06:55:43 +00:00
9ba6116091
IcingaService: support and test speciall object...
...
...name variants with apply for
2016-10-22 06:54:53 +00:00
4c9de0fa34
IcingaServiceTest: no need to store when setting...
...
...a connection
2016-10-22 06:37:22 +00:00
5d693debeb
IcingaServiceTest: re-add tests lost on rebase
2016-10-22 06:23:59 +00:00
1f660b514a
IcingaServiceForm: allow empty name for apply rule
2016-10-22 06:09:10 +00:00
7c31b37f27
IcingaServiceForm: remove duplicate code
...
Elements in this list are optional and may be used in various forms,
so keeping this in the base class is preferrable here
2016-10-22 06:09:00 +00:00
5b4e7509f4
Just a couple of phpcs complaints fixed
2016-10-22 06:08:52 +00:00
0791b900f3
QuickBaseForm: allow translation tools find 'None'
2016-10-22 06:08:44 +00:00
b00d3b4943
Change version of migration
2016-10-22 06:08:33 +00:00
b2bdeac360
Change version of DB
2016-10-22 06:08:24 +00:00
0fe47f9919
Add apply_for migrations in schema
2016-10-22 06:08:10 +00:00
3e30d34098
Use `config` variable in apply for rules
...
* use `config` instead of `value` in apply for rules
* update documentation
refs #11976
2016-10-22 06:07:57 +00:00
b5e984e0e5
Add documentation for `Apply For` services
2016-10-22 06:05:33 +00:00
e7bd4343b5
Add support for Apply for rules in services
...
Apply for rules are defined through `apply_for` property
Only Array custom variables will be eligible in apply_for dropdown.
API Example:
```bash
./director-curl POST director/service?name=my_service '{"apply_for": "for (checked_tcp_port in host.vars.checked_tcp_ports)" }'
```
Will render as:
```
apply Service "my_service" for (checked_tcp_port in host.vars.checked_tcp_ports) {
...
}
```
Feature: https://dev.icinga.org/issues/11976
Depends-On: https://github.com/Icinga/icingaweb2-module-director/pull/20
refs #11976
2016-10-22 06:00:54 +00:00
0c5a568191
Merge branch 'feature/expression-support'
2016-10-22 05:50:01 +00:00
b7eaab715b
Make explicit calls to renderStringWithVariables
2016-10-22 05:48:09 +00:00
37c91050c7
Expressions syntax is now $var$
...
Instead of $$var$$.
We make sure $$var$$ is left untouched.
refs #11976
2016-10-22 00:15:09 +00:00
ddcfb09f58
Handle expressions only for apply objects
...
Expressions will be handled only if the object is an ApplyRule.
Only properties and custom variables are replaced.
refs #11976
2016-10-22 00:15:09 +00:00
bcef87f4c9
Add support for expressions
...
Any rendered string can contain variables encapsulated with "$$" characters.
Example:
Display Name declared with `Port $$host.vars.tcp_port$$ check` will
be processed as `"Port " + host.vars.tcp_port + " check"`
API:
```bash
./director-curl POST director/service?name=my_service '{"display_name": "Port $$host.vars.tcp_port$$ check" }'
```
Rendered config:
```
apply Service "my_service" {
import "my_template"
display_name = "Port " + host.vars.tcp_port + " check"
}
```
refs #11976
2016-10-22 00:15:09 +00:00
a9b3b2f47a
IcingaObjectImports: fix compatibility issue
...
fixes #12951
2016-10-20 19:17:52 +00:00
b62b602f7d
DirectorObjectForm: move imports below name
2016-10-20 02:22:34 +00:00
9414068eee
IcingaMultiEditForm: remove superfluous dot
2016-10-20 02:13:19 +00:00
fc2890d865
IcingaObject: new helper method for single...
...
...resolved custom vars
2016-10-20 01:37:23 +00:00
32790dbedc
IcingaServiceForm: move hint to custom vars group
2016-10-20 01:35:36 +00:00
76936c7efb
IcingaTemplateResolver: fix resolver for unstored...
...
...objects
refs #12938
2016-10-20 01:32:52 +00:00
7fc2841fac
css: right-align table actions
2016-10-20 01:15:43 +00:00
d5234f723d
HostController: no loop check for 'fake' services
...
Inherited services do not exist in the db. As many services would
carry their template's name, the fallback to a name-based loop check
would trigger an erraneous error. So we trigger no preliminary loop
check for those now.
fixes #12938
2016-10-20 01:09:34 +00:00
Thomas Gelf
Markus Frosch
Geneviève Plantin
Corentin Ardeois
Corentin Ardeois