Thomas Gelf
b7eaab715b
Make explicit calls to renderStringWithVariables
2016-10-22 05:48:09 +00:00
Corentin Ardeois
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
Corentin Ardeois
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
Corentin Ardeois
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
Thomas Gelf
a9b3b2f47a
IcingaObjectImports: fix compatibility issue
...
fixes #12951
2016-10-20 19:17:52 +00:00
Thomas Gelf
b62b602f7d
DirectorObjectForm: move imports below name
2016-10-20 02:22:34 +00:00
Thomas Gelf
fc2890d865
IcingaObject: new helper method for single...
...
...resolved custom vars
2016-10-20 01:37:23 +00:00
Thomas Gelf
76936c7efb
IcingaTemplateResolver: fix resolver for unstored...
...
...objects
refs #12938
2016-10-20 01:32:52 +00:00
Thomas Gelf
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
8c2d5ec7f9
Data: flip field/list order, as fields are...
...
...more important
2016-10-17 17:24:27 +00:00
Thomas Gelf
edbda2c592
IcingaObjectFieldLoader: silently ignore setValues
...
...when called for an object without custom var support
2016-10-17 16:57:25 +00:00
Thomas Gelf
46a5b3cb2f
CubeLinks: hook into the cube module
2016-10-14 21:14:04 +00:00
Thomas Gelf
b40f4a7ab7
QuickTable: fix 'return value in write contex'...
...
...for older PHP versions
2016-10-14 19:35:52 +00:00
Thomas Gelf
23ef9a707c
MultiEdit: make it independent of an object type
2016-10-14 18:32:34 +00:00
Thomas Gelf
6a54e00402
MultiEdit: code cleanup, add custom var support
...
fixes #12465
fixes #12906
fixes #11614
2016-10-14 17:17:07 +00:00
Thomas Gelf
69237b8ae9
MultiEditForm: first shot, provides imports
...
refs #12465
2016-10-14 13:46:06 +00:00
Thomas Gelf
732ebae339
ActionController: provide a singleTab helper
2016-10-14 13:46:06 +00:00
Thomas Gelf
41c4448685
QuickTable: provide multiselect feature
...
refs #11614
2016-10-14 13:46:06 +00:00
Thomas Gelf
6f46e6b496
YesNo: new boolean-like form fields
...
fixes #12927
2016-10-14 13:39:43 +00:00
Thomas Gelf
98708e6496
Forms: better error handling
...
fixes #12926
2016-10-14 13:35:30 +00:00
Thomas Gelf
2df7144240
TemplateResolver: no more false alarms...
...
...when multiple paths lead to the same template
refs #11803
2016-10-14 11:26:41 +00:00
Thomas Gelf
558ea82203
IcingaRelatedObject: fix syntax, add comment...
...
...stating that this is unfinished
2016-10-14 10:40:29 +00:00
Thomas Gelf
cfbf40147c
IcingaObjectImports: simplify code
2016-10-14 10:33:46 +00:00
Thomas Gelf
041fd52174
FieldLoader, TemplateResolver: more cleanup
...
A few fixes related to modified imports for unstored objects
refs #12922
2016-10-14 09:59:08 +00:00
Thomas Gelf
98acba9fb4
IcingaTemplateResolver: more tweaking
...
refs #12922
2016-10-14 09:40:01 +00:00
Thomas Gelf
61f3ffff7e
TemplateResolver: deal with unstored modified...
...
...imports property
fixes #12922
2016-10-14 09:12:05 +00:00
Thomas Gelf
e04acbc55f
IcingaObjectFieldLoader: do not fail on emtpy...
...
...parents
2016-10-14 08:33:58 +00:00
Thomas Gelf
913c2687b6
IcingaObjectFieldLoader: first implementation
...
Should already replace all former functionality
refs #12904
2016-10-13 21:25:03 +00:00
Thomas Gelf
0d930efb46
IcingaObject: add new resolving helper methods
...
This for example allows to get a single inherited var and their origin
2016-10-13 21:25:03 +00:00
Markus Frosch
f527e31b14
Merge branch 'bugfix/endpoint-remove-import-12920'
...
fixes #12920
2016-10-13 16:54:34 +02:00
Markus Frosch
cc61831258
DirectorObjectForm: Allow form to select if imports are required
...
refs #12920
2016-10-13 16:37:49 +02:00
Thomas Gelf
cf4dccc817
Notification: add fields support
...
fixes #12642
2016-10-13 14:34:25 +00:00
Thomas Gelf
71b3459540
DirectorDatafieldForm: allow to wipe all related...
...
...custom variables when removing a field
fixes #12916
2016-10-13 14:02:51 +00:00
Thomas Gelf
0e45429196
ObjectForm: do not allow to choose type...
...
...when one is already given
2016-10-13 11:55:53 +00:00
Thomas Gelf
c1afda4392
IcingaObject: do not fail when rendering objects...
...
...without imports support
fixes #12618
2016-10-13 11:11:35 +00:00
Thomas Gelf
e99568fffc
DirectorObjectForm: add unique error message...
...
...without adding an error in case we detect a loop. Also improve
resolve cache invalidation and clean up old imports-related code
refs #11803
2016-10-12 15:23:54 +00:00
Thomas Gelf
05f991c585
IcingaObject: no loop detection on unstored...
...
...objects
refs #11803
2016-10-12 14:26:44 +00:00
Thomas Gelf
7993724dcb
IcingaTemplateResolver: detect and throw nesting..
...
...errors
fixes #11803
2016-10-12 14:16:19 +00:00
Thomas Gelf
0a26b94e7c
IcingaObjectMultiRelations: fix service relations
...
...for sets
2016-10-12 09:11:05 +00:00
Thomas Gelf
34ed3da3b8
IcingaObject: remove duplicated short name logic
2016-10-12 09:09:28 +00:00
Thomas Gelf
cb533f5668
IcingaConfig: deploy service sets
2016-10-12 09:04:08 +00:00
Thomas Gelf
c044de89de
SyncPropertyForm: allow to sync m:n relations
2016-10-12 08:59:42 +00:00
Thomas Gelf
9e1cea0119
IcingaObject: fix v1 rendering for some properties
...
Mostly relations, no timeout, still ugly
2016-10-12 08:31:22 +00:00
Thomas Gelf
e096ec9ec5
IcingaServiceSets: allow to set imports
2016-10-12 08:30:10 +00:00
Thomas Gelf
f2f04c44e8
ServiceSet: add CLI command, fix key
2016-10-12 07:31:00 +00:00
Thomas Gelf
b7018627a0
IcingaServiceSet: introduce a new object type
2016-10-12 07:19:02 +00:00
Thomas Gelf
8faa572098
PropertyModifierDnsRecords: re-order form fields
2016-10-11 16:02:50 +00:00
Thomas Gelf
785746fb26
GroupMembershipCache: fix messed up properties
...
fixes #12887
2016-10-11 15:26:31 +00:00
Thomas Gelf
c4da25ef25
IcingaCommandArgument: render set_if without format
...
Icinga DSL support was introduced in 348cb1aa6
and works fine, but breaks
rendering of legacy arguments with set_if_format = NULL. This should default
to 'string', as we should IMO not force NOT NULL in the DB in this case.
refs #12153
fixes #12886
2016-10-11 09:45:11 +00:00
Thomas Gelf
380fb0afe9
GroupMembershipCache: add missing property
...
fixes #12884
2016-10-10 19:15:34 +00:00