633 Commits

Author SHA1 Message Date
Thomas Gelf
b47c7be3d5 IcingaService: add use_var_overrides 2016-09-08 15:01:19 +00:00
Thomas Gelf
999019ba16 IcingaService: make sure to have a db connection
...when rendering, as we require settings
2016-09-08 13:30:37 +00:00
Thomas Gelf
d44c06fce0 IcingaService: do not hardcode override template 2016-09-08 12:08:30 +00:00
Thomas Gelf
8dd7fcd13b IcingaHost, IcingaServiceForm: fix parse error...
...on PHP < 5.5
2016-09-08 11:32:41 +00:00
Thomas Gelf
4f4b6eb63a IcingaService: allow host vars to override vars...
...for applied services

refs #12546
2016-09-08 10:45:02 +00:00
Thomas Gelf
8171bb8c04 IcingaHost: add methods dealing with overridden...
...service vars
2016-09-08 09:54:23 +00:00
Thomas Gelf
029907f01f TimePeriodRange: ranges should be more generic...
...as they will not only be used in timeperiods
2016-08-31 16:23:23 +00:00
Thomas Gelf
a4813e8046 PropertyModifierHook: allow modifiers to deal...
...with arrays

refs #12236
2016-08-30 07:53:10 +00:00
Thomas Gelf
58441b88ad IcingaService: use string helper for assignments 2016-08-27 08:46:46 +00:00
Thomas Gelf
b6d59b9aca IcingaCommand: fix skip_key handling
refs #11554
refs #11918
2016-08-26 07:00:45 +00:00
Thomas Gelf
9fb547a849 IcingaCommand/TimePeriod: use internalized templates
Icinga 2.5 moved a few default templates from ITL to the core itself and
deprecated directly setting execute & similar properties. This change will
break config deployment for 2.4.x environments without 'include <itl>', but
this would rarely be the case.

This commit also changed how we work with inherited properties to render the
right object type based on 'execute' if none is set (but got inherited).

fixes #12443
fixes #12543
2016-08-25 10:16:00 +00:00
Thomas Gelf
56a7cb285d host/services: show inherited services...
...and magically applied ones
2016-08-23 14:18:54 +00:00
Thomas Gelf
73bdfb3ecd IcingaObjectImports: keep passed objects in set()
This reduces lookups and avoids failures when unstored objects are
involved
2016-08-23 14:08:51 +00:00
Thomas Gelf
e639790d52 IcingaObject: improve type detection
fixes #12319
2016-08-09 14:17:57 +00:00
Corentin Ardeois
5bdd219533 Allow override of blacklisted properties
It is now a separate class attribute which can be overridden.
2016-08-04 15:07:26 +00:00
Thomas Gelf
54643fe5cd IcingaArguments: fix argment removal for forms
fixes #11536
2016-08-01 11:06:52 +00:00
Thomas Gelf
52e412002f IcingaCommandArgumentForm: store command, not args
refs #11536
2016-08-01 10:45:47 +00:00
Thomas Gelf
6258230fdb IcingaArguments: test and fix modification tracking
This fixes related behaviour when working on CLI, API or through
Sync Rules - but not web forms

refs #12266
2016-08-01 09:31:10 +00:00
Thomas Gelf
4c978db3d0 IcingaConfig: allow to toggle legacy renderer
refs #12264
2016-08-01 06:59:31 +00:00
Thomas Gelf
ce1c6f3099 Objects: simplify default rendering zone handling
For existing installations this should only affect Timeperiods, as
they will now prefer the global zone. Also some custom zone settings
might now take effect while they have formerly been ignored.

fixes #12252
2016-07-28 15:44:42 +00:00
Thomas Gelf
2bf5bdddb5 IcingaObject, imports: more legacy config support 2016-07-28 06:57:27 +00:00
Markus Frosch
73b1863e1a SyncRule: Allow disabling purge 2016-07-26 14:03:52 +02:00
Thomas Gelf
439757d464 IcingaHost: introduce API keys 2016-07-26 09:52:55 +02:00
Thomas Gelf
1555d049f2 DirectorDeploymentLog: use predefined aliases...
...to avoid problems with too much intelligence in deeper db
abstraction layers
2016-07-21 13:12:45 +02:00
Thomas Gelf
9a6320c2f4 ImportSource: use target_property for transforms 2016-07-20 15:21:07 +02:00
Thomas Gelf
f12e4b2033 ImportSource: provide applyModifiers helper method 2016-07-20 14:25:18 +02:00
Thomas Gelf
29564ab742 ImportSource: take over duplicated transform logic 2016-07-20 14:19:20 +02:00
Thomas Gelf
d90bb05ca2 ImportRowModifier: provide target_property...
...also adjust the related form

refs #11949
2016-07-20 13:41:16 +02:00
Thomas Gelf
38bf19eb92 ImportSource: take over modifier loading logic 2016-07-20 13:40:43 +02:00
Thomas Gelf
225e9beec6 ImportRowModifier: reduce instantiated objects 2016-07-20 12:59:02 +02:00
Thomas Gelf
15acbb5290 IcingaObject::replaceWith: implement preserve...
...and add related tests, as this is a tricky one
2016-07-14 17:06:48 +02:00
Thomas Gelf
354392d216 ImportRun: allow to fetch specific keys 2016-07-13 21:37:31 +02:00
Thomas Gelf
70c4d06a42 Sync: move key-related logic to SyncRule 2016-07-13 19:59:04 +02:00
Thomas Gelf
d4a680a6b9 ImportRun: take over specific logic from Db 2016-07-13 10:19:03 +02:00
Thomas Gelf
1f5f34cea5 IcingaObjectGroups,Imports: add some manual GC...
...to work around PHP issues
2016-06-30 09:34:27 +02:00
Thomas Gelf
9210441178 DirectorActivityLog: fix loadLatest() 2016-06-28 12:11:13 +02:00
Thomas Gelf
820d6ce197 ImportSource: fix hasChanges variable 2016-06-28 10:10:15 +02:00
Thomas Gelf
38fec2c3d5 ImportSource: set last_attempt on every attempt 2016-06-26 16:00:43 +02:00
Thomas Gelf
afaaf5760d SyncRule: proxy expected modifications 2016-06-25 23:02:36 +02:00
Thomas Gelf
9387b92da1 SyncRule: introduce purge strategies 2016-06-24 17:07:00 +02:00
Thomas Gelf
39cf0a5fb8 ImportSource: there is no end_time in ImportRun 2016-06-24 17:01:47 +02:00
Thomas Gelf
20197e1c9c ImportRun: fix prepared query 2016-06-24 17:00:44 +02:00
Thomas Gelf
57c760bca9 ImportSource: add helper methods able to fetch...
...the latest run or the latest run before a specific timestamp as an object
2016-06-24 11:48:54 +02:00
Thomas Gelf
9ae70a4377 ImportRun: provide historic run as a standalone...
...object
2016-06-24 11:47:45 +02:00
Thomas Gelf
a9b7861473 SyncRule: provide current runId 2016-06-24 08:36:12 +02:00
Thomas Gelf
516c519af9 SyncRule: add various helper methods 2016-06-23 23:14:12 +02:00
Thomas Gelf
676b5b5efe SyncRule: fix misleading error when running...
...as a Job
2016-06-23 22:36:38 +02:00
Thomas Gelf
c9ef9fe91a IcingaCommand: fix EventCommand header
fixes #12010
2016-06-22 23:58:09 +02:00
Thomas Gelf
8ac5d954e9 DirectorJob: fix timeperiod handling 2016-06-17 14:23:03 +02:00
Thomas Gelf
6665d6d80f ConfigJob: fix dealing with currently active config 2016-06-17 13:20:15 +02:00