5bae792901
IcingaTemplateResolver: ignore multicolumn key...
...
...objects on refresh (for now)
fixes #13081
2016-11-08 16:27:44 +01:00
1a311bc9a9
IcingaServiceSet: ignore empty sets when rendering
...
fixes #13079
2016-11-08 16:23:16 +01:00
e116e36051
IcingaService(legacy): Test for not null
...
refs #13049
2016-11-07 14:12:30 +01:00
314b0675ee
HostApplyMatches: Prefetch Hostgroups for resolving
...
refs #13049
2016-11-07 14:12:06 +01:00
068d38fddc
IcingaService(v1): render single service apply...
...
...fully resolved to all matching hosts respecting their rendering zone
2016-11-07 13:34:20 +01:00
7e749da982
IcingaServiceSet: implement target zone for...
...
...resolved v1 apply rules
2016-11-07 12:42:27 +01:00
2c1f745c4e
IcingaService: render service_description for v1
2016-11-07 11:38:02 +01:00
482f48ee1e
IcingaServiceSet: cleanup, shift responsability...
...
...for service_set_id property cleanup
refs #13049
2016-11-04 20:31:01 +01:00
ba7d350a8c
HostApplyMatches: resolve services and -sets...
...
...for Icinga v1.x
refs #13049
2016-11-04 19:56:56 +01:00
87fe623d11
DbObject: help IDE, render newline after a...
...
...disabled v1 object
2016-11-04 19:52:21 +01:00
7fc0da6e21
LegacyDeploymentApi: Add deployment Api for Icinga 1.x
...
refs #13049
2016-11-04 16:12:33 +01:00
003a100b9c
IcingaConfig(Legacy): Add deployment mode for Icinga 1 config
...
refs #13049
2016-11-04 10:28:11 +01:00
a656ca4067
IcingaService: correctly prefix host properties
...
fixes #13040
2016-11-03 20:02:51 +01:00
ef9ef52124
IcingaService: provide assignment properties
...
fixes #12731
fixes #13038
fixes #12073
2016-11-03 16:35:27 +01:00
199a46abcb
IcingaObject(Legacy): Render check_command when inherited, but ARGn is set
...
refs #12919
2016-11-03 14:16:07 +01:00
1d7cfa343e
IcingaHost(Legacy): Render alias with renderLegacyCustomExtensions
...
refs #12919
2016-11-03 13:46:16 +01:00
6b9d23cdd5
IcingaObject(legacy): Render check_command with ARGn from customvars
...
refs #12919
2016-11-03 13:41:44 +01:00
b9e4162635
IcingaObject(legacy): Fix alignLegacyProperties for long attributes
...
refs #12919
2016-11-03 13:41:44 +01:00
3f53285566
IcingaObjectMultiRelations(Legacy): add toLegacyConfigString
...
refs #12919
2016-11-03 13:41:44 +01:00
a804874a54
IcingaConfigRenderer(Legacy): Update classes for interface change
...
refs #12919
2016-11-03 13:41:44 +01:00
1502dd9c90
IcingaObject(Legacy): Render display_name as alias
...
With the execption of Host and Service.
refs #12919
2016-11-03 13:41:44 +01:00
f2ff967b07
IcingaTimeperiodRanges(Legacy): Implement toLegacyConfigString
...
refs #12919
2016-11-03 13:41:44 +01:00
ab7d0fb085
IcingaObject(Legacy): Render legacy customvars
...
refs #12919
2016-11-03 13:41:44 +01:00
1e70cface0
IcingaObject(Legacy): Render directly added groups
...
refs #12919
2016-11-03 13:41:44 +01:00
a8179507dc
IcingaObject(Legacy): Make getLegacyObjectType public
...
refs #12919
2016-11-03 13:41:44 +01:00
ffa5da86c9
IcingaCommand(Legacy): Fix type and render command_line
...
refs #12919
2016-11-03 13:41:44 +01:00
1cedc64c5a
IcingaObject(Legacy): Properly comment a disabled object
...
refs #12919
2016-11-03 13:41:44 +01:00
a2151fd9d1
IcingaObject(Legacy): Add getLegacyObjectType function
...
So the type rendered to the object header can get overwritten.
refs #12919
2016-11-03 13:41:44 +01:00
802b923df6
IcingaConfig: Add v1-masterless config format
...
Do not render a passive checkable to the master zone then.
refs #12919
2016-11-03 13:41:44 +01:00
31a321e13e
IcingaObject(legacy): Add flag to render only supported objects
...
refs #12919
2016-11-03 13:41:44 +01:00
2e2f4739c7
IcingaObject(legacy): Only render passive objects for checkables
...
Also simplify renderToLegacyConfig.
refs #12919
2016-11-03 13:41:44 +01:00
468a2719a7
DirectorActivityLog: optionally log to file/syslog
...
fixes #12976
2016-11-02 18:40:43 +01:00
ee0def7d2b
Lots of files: make IDE users happy
2016-11-01 18:28:36 +01:00
2b227a356b
IcingaObjectGroups: Respect PrefetchCache
2016-10-31 17:21:21 +01:00
672a45b26e
IcingaObject: loadAllByType should respect PrefetchCache
2016-10-31 17:21:21 +01:00
86d2f317ee
IcingaObject: Do not invalidate templateResolver on every setImports()
...
Do not clear templateResolver, but refresh current object with its "new" parents.
refs #11803
2016-10-31 17:21:21 +01:00
22802114ac
IcingaService: do not disable services twice
...
fixes #13017
2016-10-31 12:36:45 +00:00
78903553e9
IcingaService: disable services belonging to a...
...
...single disabled host
fixes #12049
2016-10-29 22:06:52 +00:00
a4ef711ef0
SyncProperty: simplify code and form
...
fixes #12700
2016-10-29 21:25:42 +00:00
d2f359e3e3
UserGroup: do not provide assign_filter property
...
fixes #13007
2016-10-28 23:29:33 +00:00
5fc9aabd3e
ImportSource: fix syntax error
2016-10-27 19:47:02 +00:00
c10ad0e3a2
ImportSource: allow to transfer nested keys
2016-10-27 19:01:49 +00:00
66e5158ccc
Dashboard: replace it with a modular one
...
fixes #12997
2016-10-27 17:58:31 +00:00
e59e2d0c2c
Merge remote-tracking branch 'origin/master'
2016-10-27 16:35:19 +00:00
f9f61be7aa
IcingaObject: Allow replaceWith on non-apply Objects
...
This broke with assign_filter changes, we should not throw an error when
the filter is actually null.
replaceWith() re-sets all vars.
refs #12033
2016-10-27 15:46:52 +02:00
d59604bd93
ServiceSet: rework sets, allow for vars and...
...
...all other service properties when adding services to a set
2016-10-25 23:12:23 +00:00
f09560a89e
IcingaServiceSet: simplify code
2016-10-25 23:12:23 +00:00
7f34e4bdf3
IcingaServiceSet: improve work with imports
2016-10-25 23:12:23 +00:00
354d12946a
IcingaServiceSet: render custom vars
2016-10-25 23:12:23 +00:00
696e63b4ec
Servicesset: add controller, form and table
2016-10-25 23:12:23 +00:00
6a45d9507d
IcingaServiceSet: remove legacy resolving methods
...
They have been used once we had no imports
2016-10-25 23:12:23 +00:00
fa2c360f4c
IcingaObject: fix arguments rendering for external
...
...objects
2016-10-25 02:28:19 +00:00
ad7c5bc997
IcingaHost: fix tests
2016-10-25 00:30:12 +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
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
aeafec37d7
FormDataFilter: simplify HTML, Code and style
2016-10-23 04:23:38 +00:00
88a741a8d0
IcingaService: introduce assign_filter property
2016-10-22 07:02:09 +00:00
6ed24f93da
IcingaObject: render assign_filter property
2016-10-22 07:02:09 +00:00
9349ba0f2a
FormDataFilter: new implementation for assignments
...
First prototype
2016-10-22 07:02:09 +00:00
9ba6116091
IcingaService: support and test speciall object...
...
...name variants with apply for
2016-10-22 06:54:53 +00:00
1f660b514a
IcingaServiceForm: allow empty name for apply rule
2016-10-22 06:09:10 +00:00
5b4e7509f4
Just a couple of phpcs complaints fixed
2016-10-22 06:08:52 +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
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
b7eaab715b
Make explicit calls to renderStringWithVariables
2016-10-22 05:48: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
a9b3b2f47a
IcingaObjectImports: fix compatibility issue
...
fixes #12951
2016-10-20 19:17:52 +00:00
fc2890d865
IcingaObject: new helper method for single...
...
...resolved custom vars
2016-10-20 01:37:23 +00:00
76936c7efb
IcingaTemplateResolver: fix resolver for unstored...
...
...objects
refs #12938
2016-10-20 01:32:52 +00:00
98708e6496
Forms: better error handling
...
fixes #12926
2016-10-14 13:35:30 +00:00
2df7144240
TemplateResolver: no more false alarms...
...
...when multiple paths lead to the same template
refs #11803
2016-10-14 11:26:41 +00:00
558ea82203
IcingaRelatedObject: fix syntax, add comment...
...
...stating that this is unfinished
2016-10-14 10:40:29 +00:00
cfbf40147c
IcingaObjectImports: simplify code
2016-10-14 10:33:46 +00:00
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
98acba9fb4
IcingaTemplateResolver: more tweaking
...
refs #12922
2016-10-14 09:40:01 +00:00
61f3ffff7e
TemplateResolver: deal with unstored modified...
...
...imports property
fixes #12922
2016-10-14 09:12:05 +00:00
913c2687b6
IcingaObjectFieldLoader: first implementation
...
Should already replace all former functionality
refs #12904
2016-10-13 21:25:03 +00:00
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
cf4dccc817
Notification: add fields support
...
fixes #12642
2016-10-13 14:34:25 +00:00
c1afda4392
IcingaObject: do not fail when rendering objects...
...
...without imports support
fixes #12618
2016-10-13 11:11:35 +00:00
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
05f991c585
IcingaObject: no loop detection on unstored...
...
...objects
refs #11803
2016-10-12 14:26:44 +00:00
7993724dcb
IcingaTemplateResolver: detect and throw nesting..
...
...errors
fixes #11803
2016-10-12 14:16:19 +00:00
0a26b94e7c
IcingaObjectMultiRelations: fix service relations
...
...for sets
2016-10-12 09:11:05 +00:00
34ed3da3b8
IcingaObject: remove duplicated short name logic
2016-10-12 09:09:28 +00:00
c044de89de
SyncPropertyForm: allow to sync m:n relations
2016-10-12 08:59:42 +00:00
9e1cea0119
IcingaObject: fix v1 rendering for some properties
...
Mostly relations, no timeout, still ugly
2016-10-12 08:31:22 +00:00
e096ec9ec5
IcingaServiceSets: allow to set imports
2016-10-12 08:30:10 +00:00
f2f04c44e8
ServiceSet: add CLI command, fix key
2016-10-12 07:31:00 +00:00
b7018627a0
IcingaServiceSet: introduce a new object type
2016-10-12 07:19:02 +00:00
c4da25ef25
IcingaCommandArgument: render set_if without format
...
Icinga DSL support was introduced in 348cb1aa6#12153
fixes #12886
2016-10-11 09:45:11 +00:00
df36071c9c
IcingaService: single objects should respect...
...
...their host's zone where not overriden by a service template
fixes #11988
2016-10-10 10:57:24 +00:00
38eaf4036b
IcingaHost: agent-related hint for legacy config
2016-10-09 13:27:38 +00:00
e96db8b296
IcingaObject: move duplicate logic to common func
2016-10-09 13:15:05 +00:00
cf063180d2
IcingaObject: start to dry out relation-related...
...
...code. Still weird and hard to understand because of lazy-loading,
can only get better. All this is required to be able to render objects
having obsolete dependencies in our activity log
2016-10-09 12:48:13 +00:00
6f12663756
PrefetchCache: lot's of improvements
...
This commit enables the prefetch cache per default when rendering configs
and adds the following features:
* prefetch all kinds of Icinga object inheritance (imports)
* prefetch group memberships
* prefetch custom variables
* render vars with the same checksum only once
Roughly measured performance boost with a large real-life config, renders three
times faster as it did before. Might be even more for those suffering from high
latencies when accessing their DB remotely and/or on a slow storage.
fixes #12876
2016-10-09 12:41:06 +00:00
c0a8c49d4f
show/activitylog: fallback rendering for hosts...
...
...with obsolete parents, that have been removed in the meantime
2016-10-06 16:29:50 +00:00
749f035971
Db/IcingaObject: formatting & style
2016-10-05 18:05:59 +00:00
d1b7083145
IcingaObject: add helper methods for relations
2016-10-05 17:58:48 +00:00
e9a570e96d
Sync: fix sync & purge for datalistEntry objects
2016-10-05 17:45:25 +00:00
348cb1aa63
IcingaCommandArgument: allow expressions in set_if
...
fixes #12153
2016-09-23 15:18:58 +00:00
3383b97e69
IcingaRelatedObject: new helper class
2016-09-16 21:56:35 +00:00
42212661f2
IcingaObject: document 'supports' vars and methods
2016-09-15 18:53:09 +00:00
407a387dab
DirectorDatalistEntry: add shouldBeRemoved...
...
...fixes sync for DatalistEntries
fixes #12715
2016-09-12 21:41:15 +00:00
f52cd5ea77
DirectorDatafield: simplify usage
2016-09-09 21:32:26 +00:00
217fb38517
IcingaObject: implement supportsAssignRules
2016-09-09 09:06:31 +00:00
a90595a004
IcingaHostGroup: Add apply statements
2016-09-09 08:32:42 +00:00
2c7c54a15d
IcingaConfig: improve override constant usage
2016-09-08 20:24:54 +00:00
b2b189c425
IcingaServiceForm: support use_var_overrides...
...
...even for single host-assigned services
2016-09-08 18:43:25 +00:00
b47c7be3d5
IcingaService: add use_var_overrides
2016-09-08 15:01:19 +00:00
999019ba16
IcingaService: make sure to have a db connection
...
...when rendering, as we require settings
2016-09-08 13:30:37 +00:00
d44c06fce0
IcingaService: do not hardcode override template
2016-09-08 12:08:30 +00:00
8dd7fcd13b
IcingaHost, IcingaServiceForm: fix parse error...
...
...on PHP < 5.5
2016-09-08 11:32:41 +00:00
4f4b6eb63a
IcingaService: allow host vars to override vars...
...
...for applied services
refs #12546
2016-09-08 10:45:02 +00:00
8171bb8c04
IcingaHost: add methods dealing with overridden...
...
...service vars
2016-09-08 09:54:23 +00:00
029907f01f
TimePeriodRange: ranges should be more generic...
...
...as they will not only be used in timeperiods
2016-08-31 16:23:23 +00:00
a4813e8046
PropertyModifierHook: allow modifiers to deal...
...
...with arrays
refs #12236
2016-08-30 07:53:10 +00:00
58441b88ad
IcingaService: use string helper for assignments
2016-08-27 08:46:46 +00:00
b6d59b9aca
IcingaCommand: fix skip_key handling
...
refs #11554
refs #11918
2016-08-26 07:00:45 +00:00
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
56a7cb285d
host/services: show inherited services...
...
...and magically applied ones
2016-08-23 14:18:54 +00:00
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
e639790d52
IcingaObject: improve type detection
...
fixes #12319
2016-08-09 14:17:57 +00:00
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
54643fe5cd
IcingaArguments: fix argment removal for forms
...
fixes #11536
2016-08-01 11:06:52 +00:00
52e412002f
IcingaCommandArgumentForm: store command, not args
...
refs #11536
2016-08-01 10:45:47 +00:00
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
4c978db3d0
IcingaConfig: allow to toggle legacy renderer
...
refs #12264
2016-08-01 06:59:31 +00:00
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
2bf5bdddb5
IcingaObject, imports: more legacy config support
2016-07-28 06:57:27 +00:00
73b1863e1a
SyncRule: Allow disabling purge
2016-07-26 14:03:52 +02:00
439757d464
IcingaHost: introduce API keys
2016-07-26 09:52:55 +02:00
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
9a6320c2f4
ImportSource: use target_property for transforms
2016-07-20 15:21:07 +02:00
f12e4b2033
ImportSource: provide applyModifiers helper method
2016-07-20 14:25:18 +02:00
29564ab742
ImportSource: take over duplicated transform logic
2016-07-20 14:19:20 +02:00
d90bb05ca2
ImportRowModifier: provide target_property...
...
...also adjust the related form
refs #11949
2016-07-20 13:41:16 +02:00
38bf19eb92
ImportSource: take over modifier loading logic
2016-07-20 13:40:43 +02:00
225e9beec6
ImportRowModifier: reduce instantiated objects
2016-07-20 12:59:02 +02:00
15acbb5290
IcingaObject::replaceWith: implement preserve...
...
...and add related tests, as this is a tricky one
2016-07-14 17:06:48 +02:00
354392d216
ImportRun: allow to fetch specific keys
2016-07-13 21:37:31 +02:00
70c4d06a42
Sync: move key-related logic to SyncRule
2016-07-13 19:59:04 +02:00
d4a680a6b9
ImportRun: take over specific logic from Db
2016-07-13 10:19:03 +02:00
1f5f34cea5
IcingaObjectGroups,Imports: add some manual GC...
...
...to work around PHP issues
2016-06-30 09:34:27 +02:00
9210441178
DirectorActivityLog: fix loadLatest()
2016-06-28 12:11:13 +02:00
820d6ce197
ImportSource: fix hasChanges variable
2016-06-28 10:10:15 +02:00
38fec2c3d5
ImportSource: set last_attempt on every attempt
2016-06-26 16:00:43 +02:00
afaaf5760d
SyncRule: proxy expected modifications
2016-06-25 23:02:36 +02:00
9387b92da1
SyncRule: introduce purge strategies
2016-06-24 17:07:00 +02:00
Thomas Gelf
Markus Frosch
Corentin Ardeois
Markus Frosch
Marc DeTrano
Corentin Ardeois