Commit Graph

648 Commits

Author SHA1 Message Date
Thomas Gelf 45c93b3445 HostGroupMembershipResolver: first implementation
refs #832
2017-07-14 13:21:42 +02:00
Thomas Gelf 47bfb2d31d IcingaObjectImports: add meaningful error...
...would have saved me some troubleshooting time
2017-07-14 13:21:42 +02:00
Thomas Gelf 2237272b6b SyncRule: do not allow to sync unless some...
...properties have been defined.

fixes #383
2017-05-03 11:24:22 +02:00
Thomas Gelf f91dd5fa0e PropertyModifierCombine: implementation, tests...
...and related changes with some documentation

fixes #922
2017-05-03 10:39:49 +02:00
Thomas Gelf 6234648a1f IcingaEndpoint: work on Zone, not on the id
fixes #878
2017-03-29 12:52:54 +02:00
Thomas Gelf 58ba7f9f86 IcingaEndpoint: deploy to where it's Zone is...
...to be found

refs #463
2017-03-29 11:41:13 +02:00
Thomas Gelf 3714d2567b IcingaEndpoint: fix indentation 2017-03-28 20:56:10 +02:00
Thomas Gelf 9f2070dced IcingaEndpoint: provide getRestApiClient() helper
fixes #877
2017-03-28 18:08:27 +02:00
Thomas Gelf afce89dc98 DirectorActivityLog: log username and ip
Logged values are now JSON-encoded

fixes #849
2017-03-15 12:02:08 +01:00
Thomas Gelf cb9fff90ef IcingaObject: add new static helper, expose...
...existing one

refs #842
2017-03-13 22:03:02 +01:00
Thomas Gelf bff76dad8e HostApplyMatches: fix matching for "contains"
fixes  #803
2017-03-03 09:41:25 +01:00
Thomas Gelf bfde75a0a2 IcingaServiceSet: import DirectorOverrideTemplate
...when rendering services belonging to a set for a single host

fixes #776
2017-02-08 10:04:47 +01:00
Thomas Gelf d4b769b8d7 IcingaHost: do not render Endpoint and Zone...
...for disabled hosts

fixes #741
2017-01-24 09:45:32 +01:00
Thomas Gelf c75b4fc6b0 DirectorDatafield: phpcs -> SpacingBeforeClose 2017-01-19 13:58:07 +01:00
Thomas Gelf b08be6ecc0 DirectorDatafield: do not fail on missing command
refs #712
refs #731
2017-01-19 13:55:59 +01:00
Thomas Gelf 164b5bd93d Fields: fix inheriting fields from commands
refs #712
refs #731
2017-01-19 13:50:50 +01:00
Thomas Gelf b7a10d296c phpcs: mostly new PSR-2 SpacingAfter/Before checks 2017-01-13 20:54:52 +01:00
Thomas Gelf 9e771f2d5a Fix phpcs complaints 2017-01-13 19:47:54 +01:00
Thomas Gelf 792e58abae DirectorDatafield: just newlines 2017-01-13 16:39:35 +01:00
Thomas Gelf f874a79bb4 IcingaObjectFieldLoader: no mandatory field on cmd
fixes #12644
2017-01-13 16:05:34 +01:00
Thomas Gelf 40ff51e487 IcingaTemplateResolver: separate concerns...
...and make helper accessible
2017-01-13 15:20:04 +01:00
Thomas Gelf 0a9ed6ff39 HostApplyMatches: allow usage for single hosts
refs #13849
2017-01-02 10:15:55 +01:00
Thomas Gelf a9874879dd TemplateResolver: add new methods for stricter...
...path resolution. Also ships related tests

refs #13839
2016-12-30 10:15:25 +01:00
Thomas Gelf efe6fd35ab IcingaObject: remove code loading fields...
...we now have a dedicated class for this
2016-12-28 12:44:51 +01:00
Thomas Gelf d4736f4a41 IcingaObject: better way to get resolved props? 2016-12-16 13:21:48 +01:00
Thomas Gelf 241404d9ba HostApplyMatches: do not skip defaults
May avoid errors when working with properties defined only on some of your
hosts
2016-12-16 13:19:02 +01:00
Thomas Gelf 949d6c9b54 IcingaCommandField: one more implementation 2016-12-14 16:36:33 +01:00
Thomas Gelf 5847913987 Fields: add a possibility to show fields based...
...on filter rules
2016-12-14 16:36:33 +01:00
Thomas Gelf 4c1ab4dae6 php: just some comments and cleanup 2016-12-13 18:25:14 +01:00
Thomas Gelf 04f9b360da DirectorDataField: preserve settings in fromDbRow
refs #13259
2016-12-13 17:14:58 +01:00
Thomas Gelf 58a64cee78 SyncRule: initialize hasServiceSet 2016-12-13 13:51:41 +01:00
Thomas Gelf f1a61e2557 ServiceGroup: allow to assign them to services...
...via assignment rules

fixes #13415
2016-12-13 09:51:52 +01:00
Thomas Gelf 1acf332f6b DirectorDataField: whether a field is required...
...is a setting
2016-12-07 09:43:16 +01:00
Thomas Gelf 2ea573e338 IcingaVar: use new CustomVar helpers 2016-12-07 08:29:20 +01:00
Thomas Gelf 7dd2ac6b83 IcingaService: enum service vars, not host vars
fixes #13359
2016-11-30 09:33:29 +01:00
Thomas Gelf 1e9e15278a Merge branch 'bugfix/service-set-contraints-13309' 2016-11-30 08:16:47 +01:00
Markus Frosch 4a838ca277 IcingaHostGroup(Legacy): Load zones prefetched
refs #13049
2016-11-30 08:12:27 +01:00
Markus Frosch c2734fd4d4 IcingaHostGroup(Legacy): Render assigned groups to all zones
So we still can support hosts with direct groups.

refs #13049
2016-11-30 08:12:27 +01:00
Markus Frosch aaeca533fc IcingaConfig/IcingaObject(Legacy): Render dummy notification settings
So we avoid warnings about nothing configured.

refs #13049
2016-11-30 08:12:27 +01:00
Markus Frosch 3a8cad2486 IcingaServiceSet: Check if object_name is unique for templates
refs #13309
2016-11-28 15:32:41 +01:00
Thomas Gelf d5131f7fac Arguments: always render += instead of =
This allows to extend existing arguments

fixes #12941
2016-11-15 17:57:02 +01:00
Markus Frosch 4e5dfb097e IcingaService(Legacy): Fix duplicated rendering of apply
refs #13049
2016-11-15 10:52:03 +01:00
Markus Frosch b40cfd5f05 IcingaHostGroup(Legacy): Fix member rendering with correct attribute
refs #13049
2016-11-14 15:36:55 +01:00
Markus Frosch 5ee911ef7c IcingaObject(Legacy): Fix event_handler rendering
refs #13049
2016-11-14 15:32:14 +01:00
Markus Frosch d4c3be0bf5 IcingaHostGroup|IcingaService(Set): Fix legacy config file extension
refs #13049
2016-11-14 15:28:52 +01:00
Thomas Gelf 913d934762 IcingaObject: introduce getSingleResolvedProperty()
Motivation: getResolvedProperty() has the effect that objects will fully
resolve all inherited properties, vars and fields. This is overkill in
situations where only a few resolves properties are needed and has quite
an influence on overall rendering performance.

Over time we might completely fade out that part of our resolving logic
as it predates current cache implementations. Meanwhile, we keep two
methods for two (internal) purposes.
2016-11-14 13:25:26 +01:00
Markus Frosch 116016bbfc HostApplyMatches: Raise memory_limit for bigger caches
refs #13049
2016-11-11 11:49:37 +01:00
Markus Frosch a8a9278806 IcingaHostGroup(legacy): Render assign to a hostgroup_member list
Supporting active-passive and masterless, by writing multiple versions of the object.

refs #13049
2016-11-11 11:49:37 +01:00
Markus Frosch 31520a7d21 IcingaService: Don't even try to render service_set related services
refs #12891
2016-11-11 11:49:37 +01:00
Markus Frosch 1a51e55563 Merge branch 'feature/better-import-table' 2016-11-11 11:30:56 +01:00
Markus Frosch 8b5689545c Sync(Rule): Allow to sync services of a ServiceSet
This extends the destination key pattern for Sync.

refs #12891
2016-11-11 11:06:01 +01:00
Markus Frosch ddd59ab274 IcingaServiceSet: A simple key identifies a ServiceSet (template)
refs #12891
2016-11-11 11:06:01 +01:00
Markus Frosch 39538a3f33 SyncRule: Support hasCombinedKey for serviceSet
refs #12891
2016-11-11 10:44:22 +01:00
Thomas Gelf eb1f1a2c33 doc/testing: fix syntax 2016-11-10 20:03:29 +01:00
Markus Frosch b4cb6f8ccb ImportRun: Add access to ImportSource 2016-11-09 14:20:35 +01:00
Thomas Gelf 5bae792901 IcingaTemplateResolver: ignore multicolumn key...
...objects on refresh (for now)

fixes #13081
2016-11-08 16:27:44 +01:00
Thomas Gelf 1a311bc9a9 IcingaServiceSet: ignore empty sets when rendering
fixes #13079
2016-11-08 16:23:16 +01:00
Markus Frosch e116e36051 IcingaService(legacy): Test for not null
refs #13049
2016-11-07 14:12:30 +01:00
Markus Frosch 314b0675ee HostApplyMatches: Prefetch Hostgroups for resolving
refs #13049
2016-11-07 14:12:06 +01:00
Thomas Gelf 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
Thomas Gelf 7e749da982 IcingaServiceSet: implement target zone for...
...resolved v1 apply rules
2016-11-07 12:42:27 +01:00
Thomas Gelf 2c1f745c4e IcingaService: render service_description for v1 2016-11-07 11:38:02 +01:00
Thomas Gelf 482f48ee1e IcingaServiceSet: cleanup, shift responsability...
...for service_set_id property cleanup

refs #13049
2016-11-04 20:31:01 +01:00
Thomas Gelf ba7d350a8c HostApplyMatches: resolve services and -sets...
...for Icinga v1.x

refs #13049
2016-11-04 19:56:56 +01:00
Thomas Gelf 87fe623d11 DbObject: help IDE, render newline after a...
...disabled v1 object
2016-11-04 19:52:21 +01:00
Markus Frosch 7fc0da6e21 LegacyDeploymentApi: Add deployment Api for Icinga 1.x
refs #13049
2016-11-04 16:12:33 +01:00
Markus Frosch 003a100b9c IcingaConfig(Legacy): Add deployment mode for Icinga 1 config
refs #13049
2016-11-04 10:28:11 +01:00
Thomas Gelf a656ca4067 IcingaService: correctly prefix host properties
fixes #13040
2016-11-03 20:02:51 +01:00
Thomas Gelf ef9ef52124 IcingaService: provide assignment properties
fixes #12731
fixes #13038
fixes #12073
2016-11-03 16:35:27 +01:00
Markus Frosch 199a46abcb IcingaObject(Legacy): Render check_command when inherited, but ARGn is set
refs #12919
2016-11-03 14:16:07 +01:00
Markus Frosch 1d7cfa343e IcingaHost(Legacy): Render alias with renderLegacyCustomExtensions
refs #12919
2016-11-03 13:46:16 +01:00
Markus Frosch 6b9d23cdd5 IcingaObject(legacy): Render check_command with ARGn from customvars
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch b9e4162635 IcingaObject(legacy): Fix alignLegacyProperties for long attributes
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch 3f53285566 IcingaObjectMultiRelations(Legacy): add toLegacyConfigString
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch a804874a54 IcingaConfigRenderer(Legacy): Update classes for interface change
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch 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
Markus Frosch f2ff967b07 IcingaTimeperiodRanges(Legacy): Implement toLegacyConfigString
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch ab7d0fb085 IcingaObject(Legacy): Render legacy customvars
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch 1e70cface0 IcingaObject(Legacy): Render directly added groups
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch a8179507dc IcingaObject(Legacy): Make getLegacyObjectType public
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch ffa5da86c9 IcingaCommand(Legacy): Fix type and render command_line
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch 1cedc64c5a IcingaObject(Legacy): Properly comment a disabled object
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch 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
Markus Frosch 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
Markus Frosch 31a321e13e IcingaObject(legacy): Add flag to render only supported objects
refs #12919
2016-11-03 13:41:44 +01:00
Markus Frosch 2e2f4739c7 IcingaObject(legacy): Only render passive objects for checkables
Also simplify renderToLegacyConfig.

refs #12919
2016-11-03 13:41:44 +01:00
Thomas Gelf 468a2719a7 DirectorActivityLog: optionally log to file/syslog
fixes #12976
2016-11-02 18:40:43 +01:00
Thomas Gelf ee0def7d2b Lots of files: make IDE users happy 2016-11-01 18:28:36 +01:00
Markus Frosch 2b227a356b IcingaObjectGroups: Respect PrefetchCache 2016-10-31 17:21:21 +01:00
Markus Frosch 672a45b26e IcingaObject: loadAllByType should respect PrefetchCache 2016-10-31 17:21:21 +01:00
Markus Frosch 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
Thomas Gelf 22802114ac IcingaService: do not disable services twice
fixes #13017
2016-10-31 12:36:45 +00:00
Thomas Gelf 78903553e9 IcingaService: disable services belonging to a...
...single disabled host

fixes #12049
2016-10-29 22:06:52 +00:00
Thomas Gelf a4ef711ef0 SyncProperty: simplify code and form
fixes #12700
2016-10-29 21:25:42 +00:00
Thomas Gelf d2f359e3e3 UserGroup: do not provide assign_filter property
fixes #13007
2016-10-28 23:29:33 +00:00
Thomas Gelf 5fc9aabd3e ImportSource: fix syntax error 2016-10-27 19:47:02 +00:00
Thomas Gelf c10ad0e3a2 ImportSource: allow to transfer nested keys 2016-10-27 19:01:49 +00:00
Thomas Gelf 66e5158ccc Dashboard: replace it with a modular one
fixes #12997
2016-10-27 17:58:31 +00:00
Thomas Gelf e59e2d0c2c Merge remote-tracking branch 'origin/master' 2016-10-27 16:35:19 +00:00
Markus Frosch 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