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
Thomas Gelf
a761bb108b
IcingaService: render dedicated host before imports
...
This fixes issues with object and apply types showing different
behaviour in Icinga 2 when inheriting the very same template.
2016-06-17 11:55:48 +02:00
Thomas Gelf
dc3a2ca999
IcingaObject: split object property rendering
...
Improves readability
2016-06-17 11:44:38 +02:00
Thomas Gelf
5c0ea2c3b0
IcingaObject: be strict on relations
2016-06-16 22:16:55 +02:00
Thomas Gelf
57656f8dd9
IcingaObject: externalize imported object loading
2016-06-16 21:40:22 +02:00
Thomas Gelf
d042f8d599
IcingaObjectImports: fix adding objects
2016-06-16 21:20:11 +02:00
Thomas Gelf
53872a4e76
DirectorJob: really run jobs
2016-06-16 14:25:35 +02:00
Thomas Gelf
3ad56d3a98
DirectorDeploymentLog: allow to fetch config...
...
...checksum for a specific stage name. Implemented getConfigChecksumForStageName
for this.
2016-06-16 14:19:45 +02:00
Thomas Gelf
2eeafbb5d1
IcingaNotification: it's "interval"...
...
...db field is notification_interval as we avoid reserved wowrds in our schema
fixes #11938
2016-06-15 08:53:04 +02:00
Thomas Gelf
1370ec7312
IcingaNotification: use ConfigurationError
2016-06-13 17:42:02 +02:00
Thomas Gelf
b83bfed186
IcingaObject: fix comments for disabled object...
...
...and switch to multiline comments, they look better in our diffs
fixes #11937
2016-06-13 17:20:44 +02:00
Thomas Gelf
e3c08c242b
IcingaTemplateResolver: initial import
...
Should help to accomplish various template resolving tasks
2016-06-12 11:19:06 +02:00
Thomas Gelf
bbdf981b99
IcingaNotification: render "to" after object name
...
fixes #11924
2016-06-10 12:43:58 +02:00
Thomas Gelf
3b8b41c3f6
IcingaCommand: allow lowercase drives (e.g. c:)
...
fixes #11906
2016-06-11 00:41:35 +02:00
Thomas Gelf
0b92ca922f
IcingaObject: render disabled objects as comments
...
fixes #11922
2016-06-11 00:30:28 +02:00
Thomas Gelf
cc9f5037f4
IcingaNotificationForm: enforce & render apply to
...
fixes #11895
2016-06-09 23:49:02 +02:00
Thomas Gelf
7dfadf1951
IcingaHost: fix parent zone for agent zone in a...
...
...satellite zone
2016-05-26 01:36:20 +02:00
Thomas Gelf
cb825b5b94
IcingaObject: fix resolveProperty in combination...
...
...with lazy-set properties
2016-05-26 01:35:12 +02:00
Thomas Gelf
984f28bfdc
DirectorActivityLog: allow to loadLatest()
2016-05-25 15:23:57 +02:00
Thomas Gelf
e79e123e19
DirectorDeploymentLog: add helper methods...
...
...dealing with related configs
2016-05-25 15:04:00 +02:00
Thomas Gelf
fa978902c7
DirectorJob: add run helper, support timeperiods
2016-05-25 12:28:07 +02:00
Thomas Gelf
44e2c73f79
IcingaNotification: add apply_to column
2016-05-24 17:42:17 +02:00
Thomas Gelf
4291f6425e
IcingaService: fake isApplyRule for host templates
2016-05-20 15:21:29 +02:00
Thomas Gelf
b3a1d54870
IcingaObject: fix c&p error, variable name
2016-05-20 09:23:48 +02:00
Thomas Gelf
9eb9d65bef
IcingaHost: pass Config to zone lookup
2016-05-20 08:51:57 +02:00
Thomas Gelf
1c79807500
IcingaObjectGroups: keep id when cloning groups
...
Before this fix we lost autoincrement ids on clone, resulting in
ill-constructed queries on deletion
fixes #11508
2016-05-20 08:47:07 +02:00
Thomas Gelf
018713a13f
IcingaObject: smaller methods for import resolvers
2016-05-20 08:36:07 +02:00
Thomas Gelf
64fbdcfeee
IcingaObjectImports: fix null handling
2016-05-20 08:12:46 +02:00
Thomas Gelf
9b731641c4
IcingaCommand: correctly render notification cmds
2016-05-19 17:04:28 +02:00
Markus Frosch
839527a2e1
IcingaObjectImports: set modified on clear
...
Imports could not have been set empty because of this
2016-05-19 16:34:07 +02:00
Thomas Gelf
480e80709a
IcingaService: simplify command endpoint rendering
...
host.name doesn't work as of #11786 . host_name should be fine for
templates, objects and apply rules. I therefore also dropped the
exception for service objects with use_agent and host_id.
2016-05-19 16:06:06 +02:00
Thomas Gelf
2007dee6c0
IcingaCommandArgument: add replaceWith method
2016-05-19 15:09:08 +02:00
Thomas Gelf
2ae326ab8c
IcingaTimePeriod: add and test isActive() method
2016-05-18 21:21:53 +02:00
Thomas Gelf
4222261434
IcingaCommand: fix windows absolute path detection
...
Also add a couple of new related tests
fixes #11550
2016-05-13 16:01:47 +02:00
Thomas Gelf
bea8988df1
IcingaService: fix and simplify command_endpoint
2016-05-10 21:13:07 +02:00
Thomas Gelf
576d62da26
IcingaObject: use resolved zone for apply/tpl
2016-05-10 20:23:45 +02:00
Thomas Gelf
d84369ce77
IcingaArgument: enforce command object id on set
2016-05-02 11:10:47 +02:00
Thomas Gelf
2209607016
ImportSource: set a default state, according to db
2016-05-02 10:44:12 +02:00
Thomas Gelf
f7bd50838d
Objects: delegate rendering zone for groups, users
2016-05-02 10:26:41 +02:00
Thomas Gelf
1158409eeb
IcingaObject: fix rendering target and tests
2016-05-02 10:23:32 +02:00
Thomas Gelf
bd937e57c5
IcingaZone: delegate rendering responsibility
2016-05-02 10:22:22 +02:00
Thomas Gelf
b6b15ce7e3
IcingaCommand: prefer to be rendered to global
2016-04-23 14:08:25 +02:00
Thomas Gelf
a8904758f3
ImportSource: refresh, provide helpers
2016-04-22 15:31:02 +02:00
Thomas Gelf
cf1e5d88a8
DirectorJob: fix settings, add state helpers
2016-04-22 14:30:52 +02:00
Thomas Gelf
e88d490021
SyncRule: add helper allowing to apply changes
2016-04-22 13:40:05 +02:00
Thomas Gelf
7265a5796b
SyncRule: add checkForChanges helper
2016-04-22 12:10:48 +02:00
Thomas Gelf
c92d1caeb4
SyncRule: adjust to fit latest schema changes
2016-04-22 11:12:29 +02:00
Thomas Gelf
ee041b5aac
DirectorJob: add job object
2016-04-22 11:12:29 +02:00
Thomas Gelf
8c02b1e6c5
IcingaObject: fix multi-relation rendering order
2016-04-22 11:12:29 +02:00
Thomas Gelf
eb25898a63
IcingaHost: make render target checks green
2016-04-20 10:27:32 +02:00
Thomas Gelf
d3b5504e47
IcingaArguments: remove forgotten var_dump
2016-04-20 10:21:16 +02:00
Thomas Gelf
f8ef034358
IcingaObject: add render target helpers
2016-04-19 21:29:03 +02:00
Thomas Gelf
e040e84e5b
IcingaObject: add isDisabled helper method
2016-04-18 13:17:47 +02:00
Thomas Gelf
46e230c5ad
IcingaObject: fix occasional error when showing...
...
...resolved properties for applied objects
2016-04-11 11:06:54 +02:00
Thomas Gelf
3e52585538
IcingaObjectAssignment: render numbers as numbers
2016-04-06 12:11:55 +02:00
Thomas Gelf
f7f73402d4
IcingaObjectAssignments: persist 'ignore' rules
2016-04-06 11:39:12 +02:00
Thomas Gelf
36c4e51aa0
IcingaObject: fix argument retrieval
2016-04-03 21:27:49 +02:00
Thomas Gelf
5854e56419
IcingaArguments: avoid false-positives when...
...
...detecting modification
2016-04-02 20:21:06 +02:00
Thomas Gelf
9d4ee40575
IcingaObjects: add missing relations
2016-04-01 17:23:23 +02:00
Thomas Gelf
65b048d78b
IcingaCommand: allow underscore in constant names
2016-04-01 14:08:27 +02:00
Thomas Gelf
03d739170c
IcingaCommand: zone is a relation
2016-04-01 14:08:11 +02:00
Thomas Gelf
8cfdbbfb1e
IcingaHost: improve and extend enumProperties
2016-03-30 19:21:47 +02:00
Thomas Gelf
9f5f955310
IcingaCommandArgument: use resolveIds as a hack
2016-03-28 23:50:15 +02:00
Thomas Gelf
2dd0f37192
IcingaArguments: fix removal, modification
2016-03-28 23:49:04 +02:00
Thomas Gelf
9e91285136
IcingaCommandArgument: fix booleans
2016-03-28 23:48:19 +02:00
Thomas Gelf
9cf3569884
IcingaObject: unresolved properties
2016-03-24 13:37:32 +01:00
Thomas Gelf
1e1cc74b31
IcingaArguments: correctly resolve them
2016-03-24 13:35:31 +01:00
Thomas Gelf
349954e1c3
IcingaObjectAssignments: show type on error
2016-03-24 13:24:52 +01:00
Thomas Gelf
98a5be4e68
IcingaObjectAssignments: play nice with forms
2016-03-24 11:41:37 +01:00
Thomas Gelf
a8ec07237d
IcingaObject: provide former assignments for...
...
...the activity log
2016-03-24 11:40:32 +01:00
Thomas Gelf
f8d6af7b3f
IcingaObject: make assignments public
2016-03-24 06:49:19 +01:00
Thomas Gelf
33ff0c77e8
IcingaObjectAssignments: complete re-write
2016-03-24 06:46:13 +01:00
Thomas Gelf
e803385673
IcingaService: fix command endpoint when...
...
...assigned by template
2016-03-22 03:12:15 +01:00
Thomas Gelf
c7cba66c83
IcingaTimePeriod: fix config errors at deploy time
2016-03-21 13:35:00 +01:00
Thomas Gelf
a49f163ca2
IcingaObject: fix argument setter
2016-03-21 10:35:11 +01:00
Thomas Gelf
675be400d1
Icinga(Command)Argument(s): refactor objects...
...
...and try to satisfy tests
2016-03-21 10:12:49 +01:00
Thomas Gelf
d7142b307a
IcingaObject: clean up legacy methods
2016-03-20 14:51:18 +01:00
Thomas Gelf
3be31ee247
IcingaObjectGroups: do not join object table
2016-03-20 14:45:50 +01:00
Thomas Gelf
99302d40f4
IcingaService: fix redirection for host services
2016-03-20 12:04:06 +01:00
Thomas Gelf
3e016311d6
DirectorActivityLog: improve removal logging
2016-03-20 12:02:45 +01:00
Thomas Gelf
dda16fd0d0
IcingaObject: introduce isObject helper method
2016-03-20 12:00:03 +01:00
Thomas Gelf
5e3fe5e2df
IcingaCommandArguments: refactor large parts
2016-03-18 13:46:06 +01:00
Thomas Gelf
1dbf2e8410
IcingaObject: failsafe helper for related object
2016-03-18 11:43:40 +01:00
Thomas Gelf
4119fee9bb
IcingaHost: syntax
2016-03-18 11:38:44 +01:00
Thomas Gelf
8680f04532
IcingaObject: a bunch of timeperiod-related fixes
2016-03-17 23:08:57 +01:00
Thomas Gelf
81e97853c4
IcingaTimePeriodRanges: lot of changes
2016-03-17 23:06:06 +01:00
Thomas Gelf
7546a9db66
IcingaObject: fix unmodified multi rel properties
...
Former object in activity log used to be buggy in case you removed
all relations of a multi-relation properties
2016-03-17 08:27:11 +01:00
Thomas Gelf
2b80c554d5
IcingaTimePeriodRanges: new range has been modified
2016-03-16 22:14:39 +01:00
Thomas Gelf
05f745c3dc
IcingaObjectMultiRelations: fix failing tests
2016-03-16 21:48:02 +01:00
Thomas Gelf
b188b9c18d
IcingaObject: a couple of small fixes
2016-03-16 21:46:00 +01:00
Thomas Gelf
03a5708a00
IcingaObject: return booleans in plain objects
2016-03-16 21:34:46 +01:00
Thomas Gelf
2b46eff08f
IcingaObject: add createByType method
2016-03-16 20:27:26 +01:00
Thomas Gelf
61674546d9
IcingaObject: return a list for multi-related
2016-03-16 19:26:28 +01:00
Thomas Gelf
d605bd7b06
IcingaObject: fix full plain for empty multi rel
2016-03-16 15:17:58 +01:00
Thomas Gelf
d008cb7ef9
IcingaService: fix rendering when assigned to tpl
2016-03-16 14:32:23 +01:00
Thomas Gelf
3aa5ecbd8e
IcingaNotification: fix CodeSniffer warnings
2016-03-16 13:57:53 +01:00
Thomas Gelf
c7bf68a70a
IcingaObjectMultiRelations: fix store and render
2016-03-16 13:53:34 +01:00
Thomas Gelf
8336d16d98
IcingaNotification: add related users and -_groups
2016-03-16 13:02:45 +01:00
Thomas Gelf
5861788420
IcingaObjectMultiRelations: new abstraction layer
2016-03-16 13:01:55 +01:00
Thomas Gelf
f971839f82
Notification: form and rendering improvements
2016-03-12 01:35:24 +01:00
Thomas Gelf
8b903486d3
IcingaObject: support merge for objects with no CV
2016-03-11 13:56:34 +01:00