3388 Commits

Author SHA1 Message Date
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
9414068eee IcingaMultiEditForm: remove superfluous dot 2016-10-20 02:13:19 +00:00
Thomas Gelf
fc2890d865 IcingaObject: new helper method for single...
...resolved custom vars
2016-10-20 01:37:23 +00:00
Thomas Gelf
32790dbedc IcingaServiceForm: move hint to custom vars group 2016-10-20 01:35:36 +00:00
Thomas Gelf
76936c7efb IcingaTemplateResolver: fix resolver for unstored...
...objects

refs #12938
2016-10-20 01:32:52 +00:00
Thomas Gelf
7fc2841fac css: right-align table actions 2016-10-20 01:15:43 +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
8679dc8a94 Import/SyncruleController: autorefresh 2016-10-18 17:34:18 +00:00
Thomas Gelf
927d59a3b3 Datafield: provide better explainations 2016-10-17 17:48:04 +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
baf0d40ea6 IcingaCommandArgumentForm: fix typo 2016-10-17 09:33:07 +00:00
Thomas Gelf
46a5b3cb2f CubeLinks: hook into the cube module 2016-10-14 21:14:04 +00:00
Thomas Gelf
a8c37695a9 IcingaMultiEditForm: translate '' to null 2016-10-14 20:13:35 +00:00
Thomas Gelf
64147e4206 objects/form: add missing view script for multiedit 2016-10-14 19:36:59 +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
5a37ba8c68 Merge branch 'feature/mass-edit-12033' 2016-10-14 19:31:01 +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
856e574c26 js: fix extensible set for mass edit
Honestly, I have no idea why this check came in. Needs more investigation.
One far day, works for now.
2016-10-14 13:46:06 +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
9e977eaf9a Merge branch 'feature/field-loader-12904'
fixes #12904
2016-10-13 21:25:18 +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
255a02cf36 IcingaEndpointForm: Render imports input only when set
We don't need Endpoint templates in GUI.

refs #12920
2016-10-13 16:39:55 +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
7b5468a263 run.php: remove screenshot routes
This has been fixed in Icinga Web 2 in the meantime. Older versions
might not see screenshots in there doc module, but that's something
I can live with :p

fixes #12918
2016-10-13 13:13:06 +00:00
Thomas Gelf
60c08b9bc8 css: fix typo in bg color
fixes #12503
2016-10-13 12:37:09 +00:00
Thomas Gelf
ad11f89abf css: use font icon when highlighting errors 2016-10-13 12:00:06 +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
Markus Frosch
1a2cede13f ServiceController|IcingaServiceForm: Catching NestingError for the form to load
fixes #11803
2016-10-13 12:25:30 +02:00
Thomas Gelf
628df65fd4 HostController: catch NestingError when...
...resolving agent property

refs #11803
2016-10-13 10:05:35 +00:00