diff --git a/charts/incubator/zabbix/.helmignore b/charts/incubator/zabbix/.helmignore deleted file mode 100644 index 77ca5567b26..00000000000 --- a/charts/incubator/zabbix/.helmignore +++ /dev/null @@ -1,30 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -# OWNERS file for Kubernetes -OWNERS -# helm-docs templates -*.gotmpl -# docs folder -/docs -# icon -icon.png diff --git a/charts/incubator/zabbix/CHANGELOG.md b/charts/incubator/zabbix/CHANGELOG.md deleted file mode 100644 index 74e3365161c..00000000000 --- a/charts/incubator/zabbix/CHANGELOG.md +++ /dev/null @@ -1,184 +0,0 @@ -# Changelog - - - -## [zabbix-2.0.0](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-2.0.0) (2022-11-10) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Major Change to GUI - - update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342)) - - update helm general non-major ([#4349](https://github.com/truecharts/charts/issues/4349)) - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - ### Fix - -- change container config label - - - - -## [zabbix-1.0.10](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-1.0.10) (2022-11-08) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342)) - - update helm general non-major ([#4349](https://github.com/truecharts/charts/issues/4349)) - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - - - -## [zabbix-1.0.9](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-1.0.9) (2022-11-08) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342)) - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - - - -## [zabbix-1.0.9](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-1.0.9) (2022-11-08) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342)) - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - - - -## [zabbix-1.0.9](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-1.0.9) (2022-11-08) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - update helm general non-major ([#4342](https://github.com/truecharts/charts/issues/4342)) - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - - - -## [zabbix-1.0.8](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-1.0.8) (2022-11-07) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - - - -## [zabbix-1.0.8](https://github.com/truecharts/charts/compare/zabbix-1.0.7...zabbix-1.0.8) (2022-11-06) - -### Chore - -- Auto-update chart README [skip ci] - - update helm general non-major ([#4329](https://github.com/truecharts/charts/issues/4329)) - - - - -## [zabbix-1.0.7](https://github.com/truecharts/charts/compare/zabbix-1.0.5...zabbix-1.0.7) (2022-11-06) - -### Chore - -- Auto-update chart README [skip ci] - - Auto-update chart README [skip ci] - - update helm general non-major ([#4317](https://github.com/truecharts/charts/issues/4317)) - - update docker general non-major ([#4312](https://github.com/truecharts/charts/issues/4312)) - - - - -## [zabbix-1.0.6](https://github.com/truecharts/charts/compare/zabbix-1.0.5...zabbix-1.0.6) (2022-11-06) - -### Chore - -- Auto-update chart README [skip ci] - - update docker general non-major ([#4312](https://github.com/truecharts/charts/issues/4312)) - - - - -## [zabbix-1.0.5](https://github.com/truecharts/charts/compare/zabbix-1.0.4...zabbix-1.0.5) (2022-11-05) - -### Chore - -- Auto-update chart README [skip ci] - - update helm general non-major ([#4308](https://github.com/truecharts/charts/issues/4308)) - - - - -## [zabbix-1.0.4](https://github.com/truecharts/charts/compare/zabbix-1.0.3...zabbix-1.0.4) (2022-11-02) - -### Chore - -- Auto-update chart README [skip ci] - - update helm general non-major ([#4261](https://github.com/truecharts/charts/issues/4261)) - - - - -## [zabbix-1.0.3](https://github.com/truecharts/charts/compare/zabbix-1.0.2...zabbix-1.0.3) (2022-10-25) - -### Chore - -- Auto-update chart README [skip ci] - - update helm general non-major - - - - -## [zabbix-1.0.2](https://github.com/truecharts/charts/compare/zabbix-1.0.1...zabbix-1.0.2) (2022-10-25) - -### Chore - -- Auto-update chart README [skip ci] - - update helm general non-major ([#4182](https://github.com/truecharts/charts/issues/4182)) - - - - -## [zabbix-1.0.1](https://github.com/truecharts/charts/compare/zabbix-1.0.0...zabbix-1.0.1) (2022-10-19) - -### Chore - -- Auto-update chart README [skip ci] - - update helm general non-major ([#4122](https://github.com/truecharts/charts/issues/4122)) - - - - -## [zabbix-1.0.0](https://github.com/truecharts/charts/compare/zabbix-server-2.0.49...zabbix-1.0.0) (2022-10-16) - -### Feat - -- rework ([#4046](https://github.com/truecharts/charts/issues/4046)) diff --git a/charts/incubator/zabbix/Chart.yaml b/charts/incubator/zabbix/Chart.yaml deleted file mode 100644 index 400baaf2771..00000000000 --- a/charts/incubator/zabbix/Chart.yaml +++ /dev/null @@ -1,42 +0,0 @@ -kubeVersion: '>=1.24.0' -apiVersion: v2 -name: zabbix -version: 4.0.30 -appVersion: 6.2.7 -description: Zabbix is an enterprise-class open source distributed monitoring solution. -home: https://truecharts.org/charts/incubator/zabbix -icon: https://truecharts.org/img/hotlink-ok/chart-icons/zabbix.png -deprecated: false -sources: -- https://github.com/truecharts/charts/tree/master/charts/incubator/zabbix -- https://github.com/truecharts/containers/tree/master/mirrorzabbix-server -maintainers: -- name: TrueCharts - email: info@truecharts.org - url: https://truecharts.org -keywords: -- zabbix -- monitoring -dependencies: -- name: common - version: 11.1.2 - repository: https://library-charts.truecharts.org - condition: "" - alias: "" - tags: [] - import-values: [] -- name: postgresql - version: 11.0.31 - repository: https://deps.truecharts.org/ - condition: postgresql.enabled - alias: "" - tags: [] - import-values: [] -annotations: - max_scale_version: 23.10.1 - min_scale_version: 22.12.4 - truecharts.org/SCALE-support: "true" - truecharts.org/category: utilities - truecharts.org/max_helm_version: "3.13" - truecharts.org/min_helm_version: "3.12" - truecharts.org/train: incubator diff --git a/charts/incubator/zabbix/README.md b/charts/incubator/zabbix/README.md deleted file mode 100644 index 83229a60265..00000000000 --- a/charts/incubator/zabbix/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# README - -## General Info - -TrueCharts can be installed as both *normal* Helm Charts or as Apps on TrueNAS SCALE. -However only installations using the TrueNAS SCALE Apps system are supported. - -For more information about this App, please check the docs on the TrueCharts [website](https://truecharts.org/charts/incubator/) - -**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/charts/issues/new/choose)** - - -## Support - -- Please check our [quick-start guides for TrueNAS SCALE](https://truecharts.org/manual/SCALE/guides/scale-intro). -- See the [Website](https://truecharts.org) -- Check our [Discord](https://discord.gg/tVsPTHWTtr) -- Open a [issue](https://github.com/truecharts/charts/issues/new/choose) - ---- - -## Sponsor TrueCharts - -TrueCharts can only exist due to the incredible effort of our staff. -Please consider making a [donation](https://truecharts.org/sponsor) or contributing back to the project any way you can! - -*All Rights Reserved - The TrueCharts Project* diff --git a/charts/incubator/zabbix/icon.png b/charts/incubator/zabbix/icon.png deleted file mode 100644 index c74c6f7b427..00000000000 Binary files a/charts/incubator/zabbix/icon.png and /dev/null differ diff --git a/charts/incubator/zabbix/questions.yaml b/charts/incubator/zabbix/questions.yaml deleted file mode 100644 index 00b3de01cc7..00000000000 --- a/charts/incubator/zabbix/questions.yaml +++ /dev/null @@ -1,966 +0,0 @@ -# Include{groups} -portals: - open: -# Include{portalLink} -questions: -# Include{global} -# Include{workload} -# Include{workloadDeployment} - -# Include{replicas1} -# Include{podSpec} -# Include{containerMain} -# Include{containerBasic} -# Include{containerAdvanced} - - variable: zabbix - group: App Configuration - label: Zabbix Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: server - label: Server Configuration - description: Info about configuration options in https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_server - schema: - additional_attrs: true - type: dict - attrs: - - variable: listen_backlog - label: ListenBacklog - description: The maximum number of pending connections in the TCP queue. - schema: - type: int - default: 0 - - variable: debug_level - label: DebugLevel - description: Specifies debug level - schema: - type: int - default: 3 - - variable: load_modules - label: LoadModule - description: Module to load at server startup. - schema: - type: list - default: [] - items: - - variable: ip_entry - label: IP Entry - schema: - type: string - default: "" - - variable: timeout - label: Timeout - description: Spend no more than Timeout seconds on processing. - schema: - type: int - default: 4 - - variable: service_manager_sync_freq - label: ServiceManagerSyncFrequency - description: Determines how often Zabbix will synchronize configuration of a service manager in seconds. - schema: - type: int - default: 60 - - variable: start_report_writers - label: StartReportWriters - description: Number of pre-forked instances of report writers. - schema: - type: int - default: 0 - - variable: start_pollers - label: StartPollers - description: Number of pre-forked instances of pollers. - schema: - type: int - default: 5 - - variable: start_ipmi_pollers - label: StartPreprocessors - description: Number of pre-forked instances of IPMI pollers. - schema: - type: int - default: 0 - - variable: start_preprocessors - label: StartPreprocessors - description: Number of pre-forked instances of preprocessing workers. - schema: - type: int - default: 3 - - variable: start_pollers_unreachable - label: StartPollersUnreachable - description: Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). - schema: - type: int - default: 1 - - variable: start_trappers - label: StartTrappers - description: Number of pre-forked instances of trappers. - schema: - type: int - default: 5 - - variable: start_pingers - label: StartPingers - description: Number of pre-forked instances of ICMP pingers. - schema: - type: int - default: 1 - - variable: start_discoverers - label: StartDiscoverers - description: Number of pre-forked instances of discoverers. - schema: - type: int - default: 1 - - variable: start_history_pollers - label: StartHistoryPollers - description: Number of pre-forked instances of history pollers. - schema: - type: int - default: 5 - - variable: start_http_pollers - label: StartHTTPPollers - description: Number of pre-forked instances of HTTP pollers. - schema: - type: int - default: 1 - - variable: start_obdc_pollers - label: StartODBCPollers - description: Number of pre-forked instances of ODBC pollers. - schema: - type: int - default: 1 - - variable: start_timers - label: StartTimers - description: Number of pre-forked instances of timers. - schema: - type: int - default: 1 - - variable: start_escalators - label: StartEscalators - description: Number of pre-forked instances of escalators. - schema: - type: int - default: 1 - - variable: start_alerters - label: StartAlerters - description: Number of pre-forked instances of alerters. - schema: - type: int - default: 3 - - variable: start_java_pollers - label: StartJavaPollers - description: Number of pre-forked instances of Java pollers. - schema: - type: int - default: 5 - - variable: start_db_syncers - label: StartDBSyncers - description: Number of pre-forked instances of history syncers. - schema: - type: int - default: 4 - - variable: start_proxy_pollers - label: StartProxyPollers - description: Number of pre-forked instances of pollers for passive proxies1. - schema: - type: int - default: 1 - - variable: start_lld_processors - label: StartLLDProcessors - description: Number of pre-forked instances of low-level discovery (LLD) workers. - schema: - type: int - default: 1 - - variable: start_vmware_collectors - label: StartVMwareCollectors - description: Number of pre-forked VMware collector instances. - schema: - type: int - default: 0 - - variable: vmware_frequency - label: VMwareFrequency - description: Delay in seconds between data gathering from a single VMware service. - schema: - type: int - default: 60 - - variable: vmware_perf_frequency - label: VMwarePerfFrequency - description: Delay in seconds between performance counter statistics retrieval from a single VMware service. - schema: - type: int - default: 60 - - variable: vmware_cache_size - label: VMwareCacheSize - description: Shared memory size for storing VMware data. - schema: - type: string - default: 8M - - variable: vmware_timeout - label: VMwareTimeout - description: The maximum number of seconds vmware collector will wait for a response from VMware service (vCenter or ESX hypervisor). - schema: - type: int - default: 10 - - variable: housekeeping_freq - label: HousekeepingFrequency - description: Determines how often Zabbix will perform housekeeping procedure in hours. - schema: - type: int - default: 1 - - variable: max_housekeeper_delete - label: MaxHousekeeperDelete - description: No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) will be deleted per one task in one housekeeping cycle. - schema: - type: int - default: 5000 - - variable: problem_housekeeper_freq - label: ProblemHousekeepingFrequency - description: Determines how often Zabbix will delete problems for deleted triggers in seconds. - schema: - type: int - default: 60 - - variable: cache_size - label: CacheSize - description: Size of configuration cache, in bytes. - schema: - type: string - default: 32M - - variable: cache_update_freq - label: CacheUpdateFrequency - description: Determines how often Zabbix will perform update of configuration cache in seconds. - schema: - type: int - default: 60 - - variable: history_cache_size - label: HistoryCacheSize - description: Size of history cache, in bytes. - schema: - type: string - default: 16M - - variable: history_index_cache_size - label: HistoryIndexCacheSize - description: Size of history index cache, in bytes. - schema: - type: string - default: 4M - - variable: history_storage_date_index - label: HistoryStorageDateIndex - description: Enable preprocessing of history values in history storage to store values in different indices based on date - schema: - type: boolean - default: false - - variable: trend_cache_size - label: TrendCacheSize - description: Size of trend cache, in bytes. - schema: - type: string - default: 4M - - variable: trend_function_cache_size - label: TrendFunctionCacheSize - description: Size of trend function cache, in bytes. - schema: - type: string - default: 4M - - variable: value_cache_size - label: ValueCacheSize - description: Size of history value cache, in bytes. - schema: - type: string - default: 8M - - variable: trapper_timeout - label: TrapperTimeout - description: Specifies how many seconds trapper may spend processing new data. - schema: - type: int - default: 300 - - variable: unreachable_period - label: UnreachablePeriod - description: Determines after how many seconds of unreachability treats a host as unavailable. - schema: - type: int - default: 45 - - variable: unreachable_delay - label: UnreachableDelay - description: Determines how often host is checked for availability during the unreachability period in seconds. - schema: - type: int - default: 15 - - variable: unavailable_delay - label: UnavailableDelay - description: Determines how often host is checked for availability during the unavailability period in seconds. - schema: - type: int - default: 60 - - variable: log_slow_queries - label: LogSlowQueries - description: Determines how long a database query may take before being logged in milliseconds. - schema: - type: int - default: 3000 - - variable: proxy_config_freq - label: ProxyConfigFrequency - description: Determines how often Zabbix server sends configuration data to a Zabbix proxy in seconds. Used only for proxies in a passive mode. - schema: - type: int - default: 3600 - - variable: proxy_data_freq - label: ProxyDataFrequency - description: Determines how often Zabbix server requests history data from a Zabbix proxy in seconds. Used only for proxies in a passive mode. - schema: - type: int - default: 1 - - variable: export_file_size - label: ExportFileSize - description: Maximum size per export file in bytes. Only used for rotation if ExportDir is set. - schema: - type: string - default: 1G - - variable: export_type - label: ExportType - description: Entity types (events, history, trends) for real-time export (all types by default). - schema: - type: list - default: [] - items: - - variable: type_entry - label: ExportType Entry - schema: - type: string - default: "" - - variable: stats_allowed_ips - label: StatsAllowedIP - description: IP addresses, optionally in CIDR notation, or DNS names of external Zabbix instances. Stats request will be accepted only from the addresses listed here. - schema: - type: list - default: [] - items: - - variable: stat_allowed_ip_entry - label: StatsAllowedIP Entry - schema: - type: string - default: "" - - variable: frontend - label: Frontend Configuration - description: Info about configuration options in https://hub.docker.com/r/zabbix/zabbix-web-nginx-pgsql - schema: - additional_attrs: true - type: dict - attrs: - - variable: server_name - label: ServerName - schema: - type: string - default: My Zabbix Server - - variable: enable_access_logs - label: WebAccessLogs - description: Sets the Access Log directive for Web-server. - schema: - type: boolean - default: true - - variable: max_execution_time - label: MaxExecutionTime - description: The variable is PHP max_execution_time option - schema: - type: int - default: 300 - - variable: memory_limit - label: MemoryLimit - description: The variable is PHP memory_limit option. - schema: - type: string - default: 128M - - variable: post_max_size - label: PostMaxSize - description: The variable is PHP post_max_size option. - schema: - type: string - default: 16M - - variable: upload_max_file_size - label: UploadMaxFileSize - description: The variable is PHP upload_max_filesize option. - schema: - type: string - default: 2M - - variable: max_input_time - label: MaxInputTime - description: The variable is PHP max_input_time option. - schema: - type: int - default: 300 - - variable: session_name - label: SessionName - description: Used as the name of the Zabbix frontend session cookie. - schema: - type: string - default: zbx_sessionid - - variable: deny_gui_access - label: DenyGUIAccess - description: Enable maintenance mode for Zabbix web-interface. - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: warning_message - label: WarningMessage - description: Information message about maintenance period for Zabbix web-interface. - schema: - type: string - default: Zabbix Server is under maintenance - - variable: access_ip_range - label: AccessIPRange - description: IP addresses which are allowed for accessing to Zabbix web-interface during maintenance period. - schema: - type: list - default: [] - items: - - variable: ip_entry - label: IP Entry - schema: - type: string - default: "" - - variable: sso_settings - label: SSOSettings - description: The variable allows to specify custom SSO settings in JSON format. - schema: - type: string - default: "" - - variable: php_fpm_pm - label: PHP FPM PM - schema: - type: string - default: dynamic - - variable: php_fpm_pm_max_children - label: PHP FPM PM Max Children - schema: - type: int - default: 50 - - variable: php_fpm_pm_start_servers - label: PHP FPM PM Start Servers - schema: - type: int - default: 5 - - variable: php_fpm_pm_min_spare_servers - label: PHP FPM PM Min Spare Servers - schema: - type: int - default: 5 - - variable: php_fpm_pm_max_spare_servers - label: PHP FPM PM Max Spare Servers - schema: - type: int - default: 35 - - variable: php_fpm_pm_max_requests - label: PHP FPM PM Max Requests - schema: - type: int - default: 0 - - variable: agent - label: Agent Configuration - description: Info about configuration options in https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_agent2 - schema: - additional_attrs: true - type: dict - attrs: - - variable: enabled - label: Enable Agent - schema: - type: boolean - default: true - show_subquestions_if: true - subquestions: - - variable: hostname - label: Hostname - description: Required for active checks and must match hostnames as configured on the server. - schema: - type: list - default: ["Zabbix server"] - items: - - variable: hostnameEntry - label: Hostname Entry - schema: - type: string - default: "" - - variable: hostname_item - label: HostnameItem - description: Item used for generating Hostname if it is not defined. Ignored if Hostname is defined. - schema: - type: string - default: "" - - variable: metadata - label: HostMetadata - description: Optional parameter that defines host metadata. - schema: - type: string - default: "" - - variable: metadata_item - label: HostMetadataItem - description: Optional parameter that defines an item used for getting host metadata. - schema: - type: string - default: "" - - variable: timeout - label: Timeout - description: Spend no more than Timeout seconds on processing. - schema: - type: int - default: 3 - - variable: enable_persistent_buffer - label: EnablePersistentBuffer - description: Enable usage of local persistent storage for active items. - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: persistent_buffer_period - label: PersistentBufferPeriod - description: The time period for which data should be stored, when there is no connection to the server or proxy. Older data will be lost. Log data will be preserved. - schema: - type: string - default: 1h - - variable: refresh_active_checks - label: RefreshActiveChecks - description: How often the list of active checks is refreshed, in seconds. - schema: - type: int - default: 120 - - variable: buffer_send - label: BufferSend - description: The time interval in seconds which determines how often values are sent from the buffer to Zabbix server. - schema: - type: int - default: 5 - - variable: buffer_size - label: BufferSize - description: Maximum number of values in a memory buffer. The agent will send all collected data to Zabbix server or proxy if the buffer is full. - schema: - type: int - default: 100 - - variable: unsafe_user_parameters - label: UnsafeUserParameters - description: Allow all characters to be passed in arguments to user-defined parameters. - schema: - type: boolean - default: false - - variable: tls_connect - label: TLSConnect - description: How the agent should connect to Zabbix server or proxy. Used for active checks. - schema: - type: string - default: unencrypted - enum: - - value: unencrypted - description: unencrypted - - value: psk - description: psk - - value: cert - description: cert - - variable: tls_accept - label: TLSAccept - description: What incoming connections to accept. Used for a passive checks. Multiple values can be specified. - schema: - type: list - default: ["unencrypted"] - items: - - variable: tls_accept_entry - label: TLSAccept Entry - schema: - type: string - default: "" - - variable: psk_identity - label: TLSPSKIdentity - description: Pre-shared key identity string, used for encrypted communications with Zabbix server. - schema: - type: string - default: "" - - variable: psk_file - label: TLSPSKFile - description: Full pathname of a file containing the agent pre-shared key used for encrypted communications with Zabbix components. - schema: - type: string - default: "" - - variable: allow_key - label: AllowKey - description: Allow execution of those item keys that match a pattern. Key pattern is a wildcard expression that supports "*" character to match any number of any characters - schema: - type: string - default: "" - - variable: deny_key - label: DenyKey - description: Deny execution of those item keys that match a pattern. Key pattern is a wildcard expression that supports "*" character to match any number of any characters. - schema: - type: string - default: "" - - variable: javagateway - label: Java Gateway Configuration - description: Info about configuration options in https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_java - schema: - additional_attrs: true - type: dict - attrs: - - variable: enabled - label: Enable Java Gateway - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: start_pollers - label: Start Pollers - description: Number of worker threads to start. - schema: - type: int - default: 3 - - variable: timeout - label: Timeout - description: Spend no more than Timeout seconds on processing. - schema: - type: int - default: 3 - - variable: debug_level - label: DebugLevel - description: Specifies debug level - schema: - type: string - default: info - - variable: webservice - label: WebService Configuration - description: Info about configuration options in https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_web_service - schema: - additional_attrs: true - type: dict - attrs: - - variable: enabled - label: Enable WebService - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: debug_level - label: DebugLevel - description: Specifies debug level - schema: - type: int - default: 3 - - variable: timeout - label: Timeout - description: Spend no more than Timeout seconds on processing. - schema: - type: int - default: 10 - - variable: snmptraps - label: SNMP Traps Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: enabled - label: Enable SNMP Traps - schema: - type: boolean - default: false -# Include{containerConfig} -# Include{podOptions} - -# Include{serviceRoot} - - variable: main - label: Main Service - description: The Primary service on which the healthcheck runs, often the webUI - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: main - label: Main Service Port Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: Port - description: This port exposes the container port on the service - schema: - type: int - default: 10211 - required: true - - variable: server - label: Server Service - description: The Server Service - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: server - label: Server Service Port Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: Port - description: This port exposes the container port on the service - schema: - type: int - default: 10051 - required: true - - variable: javagateway - label: Java Gateway Service - description: The Java Gateway Service - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: javagateway - label: Java Gateway Service Port Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: Port - description: This port exposes the container port on the service - schema: - type: int - default: 10052 - required: true - - variable: snmptraps - label: SNMP Traps Service - description: SNMP Traps Service - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorLoadBalancer} -# Include{serviceSelectorExtras} - - variable: snmptraps - label: SNMP Traps Service Port Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: Port - description: This port exposes the container port on the service - schema: - type: int - default: 162 - required: true - - variable: agent - label: Agent Service - description: Agent Service - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorClusterIP} -# Include{serviceSelectorExtras} - - variable: agent - label: Agent Service Port Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: Port - description: This port exposes the container port on the service - schema: - type: int - default: 10050 - required: true - - variable: webservice - label: WebService Service - description: WebService Service - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelectorClusterIP} -# Include{serviceSelectorExtras} - - variable: webservice - label: WebService Service Port Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: port - label: Port - description: This port exposes the container port on the service - schema: - type: int - default: 10053 - required: true -# Include{serviceExpertRoot} -# Include{serviceExpert} -# Include{serviceList} -# Include{persistenceRoot} - - variable: serveralertscripts - label: Server - Alert Scripts Storage - description: Stores the Application Alert Scripts. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serverexternalscripts - label: Server - External Scripts Storage - description: Stores the Application External Scripts. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: servermodules - label: Server - Modules Storage - description: Stores the Application Modules. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serverenc - label: Server - Encryption Storage - description: Stores the Application Encryption. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serversshkeys - label: Server - SSH Keys Storage - description: Stores the Application SSH Keys. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serversslcerts - label: Server - SSL Certs Storage - description: Stores the Application SSL Certs. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serversslkeys - label: Server - SSL Keys Storage - description: Stores the Application SSL Keys. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serverexport - label: Server - Export Storage - description: Stores the Application Export. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: serversslca - label: Server - SSL CA Storage - description: Stores the Application SSL CA. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: snmptraps - label: SNMP & Server - SNMP Traps Storage - description: Stores the Application SNMP Traps. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: snmpmibs - label: SNMP & Server - SNMP MIBS Storage - description: Stores the Application SNMP MIBS. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: agentconf - label: Agent - Configuration Storage - description: Stores the Application Configuration. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: agentenc - label: Agent - Encryption Storage - description: Stores the Application Encryption. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: agentbuffer - label: Agent - Buffer Storage - description: Stores the Application Buffer. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: javagatewaylibs - label: Java Gateway - Libs Storage - description: Stores the Application Libs. - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} -# Include{persistenceList} -# Include{ingressRoot} - - variable: main - label: Main Ingress - schema: - additional_attrs: true - type: dict - attrs: -# Include{ingressDefault} -# Include{ingressTLS} -# Include{ingressTraefik} -# Include{ingressAdvanced} -# Include{ingressList} - -# Include{securityContextRoot} - - variable: runAsUser - label: "runAsUser" - description: "The UserID of the user running the application" - schema: - type: int - default: 1997 - - variable: runAsGroup - label: "runAsGroup" - description: "The groupID of the user running the application" - schema: - type: int - default: 0 -# Include{securityContextContainer} -# Include{securityContextAdvanced} -# Include{securityContextPod} - - variable: fsGroup - label: "fsGroup" - description: "The group that should own ALL storage." - schema: - type: int - default: 568 - -# Include{resources} -# Include{advanced} -# Include{addons} -# Include{codeserver} -# Include{netshoot} -# Include{vpn} -# Include{documentation} diff --git a/charts/incubator/zabbix/templates/_agent.tpl b/charts/incubator/zabbix/templates/_agent.tpl deleted file mode 100644 index 7d756db6618..00000000000 --- a/charts/incubator/zabbix/templates/_agent.tpl +++ /dev/null @@ -1,50 +0,0 @@ -{{- define "zabbix.agent2" -}} -image: {{ .Values.agent2Image.repository }}:{{ .Values.agent2Image.tag }} -imagePullPolicy: {{ .Values.agent2Image.pullPolicy }} -securityContext: - runAsUser: {{ .Values.podSecurityContext.runAsUser }} - runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} - readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }} - runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }} - capabilities: - add: - - SYS_TIME -volumeMounts: - - name: hostsys - mountPath: {{ .Values.persistence.hostsys.mountPath }} - - name: hostproc - mountPath: {{ .Values.persistence.hostproc.mountPath }} - - name: agentconf - mountPath: {{ .Values.persistence.agentconf.mountPath }} - - name: agentenc - mountPath: {{ .Values.persistence.agentenc.mountPath }} - - name: agentbuffer - mountPath: {{ .Values.persistence.agentbuffer.mountPath }} -envFrom: - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-agent-config' -ports: - - containerPort: {{ .Values.service.agent.ports.agent.port }} - name: agent -readinessProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }} -livenessProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }} -startupProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }} -{{- end -}} diff --git a/charts/incubator/zabbix/templates/_config.tpl b/charts/incubator/zabbix/templates/_config.tpl deleted file mode 100644 index b9d96bfa820..00000000000 --- a/charts/incubator/zabbix/templates/_config.tpl +++ /dev/null @@ -1,209 +0,0 @@ -{{/* Define the configmap */}} -{{- define "zabbix.config" -}} - -{{- $serverConfigName := printf "%s-server-config" (include "tc.common.names.fullname" .) }} -{{- $commonConfigName := printf "%s-common-config" (include "tc.common.names.fullname" .) }} -{{- $frontendConfigName := printf "%s-frontend-config" (include "tc.common.names.fullname" .) }} -{{- $agentConfigName := printf "%s-agent-config" (include "tc.common.names.fullname" .) }} -{{- $javagatewayConfigName := printf "%s-javagateway-config" (include "tc.common.names.fullname" .) }} -{{- $webserviceConfigName := printf "%s-webservice-config" (include "tc.common.names.fullname" .) }} - ---- - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $commonConfigName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - DB_SERVER_HOST: {{ printf "%v-%v" .Release.Name "postgresql" }} - DB_SERVER_PORT: "5432" - POSTGRES_USER: {{ .Values.postgresql.postgresqlUsername }} - POSTGRES_DB: {{ .Values.postgresql.postgresqlDatabase }} - ---- - -{{- $server := .Values.zabbix.server }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $serverConfigName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - ZBX_LISTENPORT: {{ .Values.service.server.ports.server.port | quote }} - {{- with $server.listen_backlog }} - ZBX_LISTENBACKLOG: {{ . | quote }} - {{- end }} - ZBX_LOADMODULE: "{{ range initial $server.load_modules }}{{ . }},{{ end }}{{ with last $server.load_modules }}{{ . }}{{ end }}" - ZBX_DEBUGLEVEL: {{ $server.debug_level | quote }} - ZBX_TIMEOUT: {{ $server.timeout | quote }} - ZBX_WEBSERVICEURL: http://localhost:{{ .Values.service.webservice.ports.webservice.port }} - ZBX_SERVICEMANAGERSYNCFREQUENCY: {{ $server.service_manager_sync_freq | quote }} - ZBX_STARTREPORTWRITERS: {{ $server.start_report_writers | quote }} - ZBX_STARTPOLLERS: {{ $server.start_pollers | quote }} - ZBX_IPMIPOLLERS: {{ $server.start_ipmi_pollers | quote }} - ZBX_STARTPREPROCESSORS: {{ $server.start_preprocessors | quote }} - ZBX_STARTPOLLERSUNREACHABLE: {{ $server.start_pollers_unreachable | quote }} - ZBX_STARTTRAPPERS: {{ $server.start_trappers | quote }} - ZBX_STARTPINGERS: {{ $server.start_pingers | quote }} - ZBX_STARTDISCOVERERS: {{ $server.start_discoverers | quote }} - ZBX_STARTHISTORYPOLLERS: {{ $server.start_history_pollers | quote }} - ZBX_STARTHTTPPOLLERS: {{ $server.start_http_pollers | quote }} - ZBX_STARTODBCPOLLERS: {{ $server.start_obdc_pollers | quote }} - ZBX_STARTTIMERS: {{ $server.start_timers | quote }} - ZBX_STARTESCALATORS: {{ $server.start_escalators | quote }} - ZBX_STARTALERTERS: {{ $server.start_alerters | quote }} - ZBX_STARTJAVAPOLLERS: {{ $server.start_java_pollers | quote }} - ZBX_STARTVMWARECOLLECTORS: {{ $server.start_vmware_collectors | quote }} - ZBX_VMWAREFREQUENCY: {{ $server.vmware_frequency | quote }} - ZBX_VMWAREPERFFREQUENCY: {{ $server.vmware_perf_frequency | quote }} - ZBX_VMWARECACHESIZE: {{ $server.vmware_cache_size }} - ZBX_VMWARETIMEOUT: {{ $server.vmware_timeout | quote }} - ZBX_HOUSEKEEPINGFREQUENCY: {{ $server.housekeeping_freq | quote }} - ZBX_MAXHOUSEKEEPERDELETE: {{ $server.max_housekeeper_delete | quote }} - ZBX_PROBLEMHOUSEKEEPINGFREQUENCY: {{ $server.problem_housekeeper_freq | quote }} - ZBX_CACHESIZE: {{ $server.cache_size }} - ZBX_CACHEUPDATEFREQUENCY: {{ $server.cache_update_freq | quote }} - ZBX_STARTDBSYNCERS: {{ $server.start_db_syncers | quote }} - ZBX_HISTORYCACHESIZE: {{ $server.history_cache_size }} - ZBX_HISTORYINDEXCACHESIZE: {{ $server.history_index_cache_size}} - ZBX_HISTORYSTORAGEDATEINDEX: {{ ternary "1" "0" $server.history_storage_date_index | quote }} - ZBX_TRENDCACHESIZE: {{ $server.trend_cache_size }} - ZBX_TRENDFUNCTIONCACHESIZE: {{ $server.trend_function_cache_size }} - ZBX_VALUECACHESIZE: {{ $server.value_cache_size }} - ZBX_TRAPPERTIMEOUT: {{ $server.trapper_timeout | quote }} - ZBX_UNREACHABLEPERIOD: {{ $server.unreachable_period | quote }} - ZBX_UNAVAILABLEDELAY: {{ $server.unavailable_delay | quote }} - ZBX_UNREACHABLEDELAY: {{ $server.unreachable_delay | quote }} - ZBX_LOGSLOWQUERIES: {{ $server.log_slow_queries | quote }} - ZBX_STARTPROXYPOLLERS: {{ $server.start_proxy_pollers | quote }} - ZBX_PROXYCONFIGFREQUENCY: {{ $server.proxy_config_freq | quote }} - ZBX_PROXYDATAFREQUENCY: {{ $server.proxy_data_freq | quote }} - ZBX_STARTLLDPROCESSORS: {{ $server.start_lld_processors | quote }} - ZBX_EXPORTFILESIZE: {{ $server.export_file_size }} - ZBX_EXPORTTYPE: "{{ range initial $server.export_type }}{{ . }},{{ end }}{{ with last $server.export_type }}{{ . }}{{ end }}" - ZBX_STATSALLOWEDIP: "{{ range initial $server.stats_allowed_ips }}{{ . }},{{ end }}{{ with last $server.stats_allowed_ips }}{{ . }}{{ end }}" - ZBX_ENABLE_SNMP_TRAPS: {{ .Values.zabbix.snmptraps.enabled | quote }} - ZBX_JAVAGATEWAY_ENABLE: {{ .Values.zabbix.javagateway.enabled | quote }} - ZBX_JAVAGATEWAY: localhost - ZBX_JAVAGATEWAYPORT: {{ .Values.service.javagateway.ports.javagateway.port | quote }} - ---- - -{{- $agent := .Values.zabbix.agent }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $agentConfigName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - ZBX_SERVER_HOST: localhost - ZBX_SERVER_PORT: {{ .Values.service.server.ports.server.port | quote }} - {{/* If hostname is set, hostname_item is ignored.*/}} - {{- if not $agent.hostname_item }} - ZBX_HOSTNAME: "{{ range initial $agent.hostname }}{{ . }},{{ end }}{{ with last $agent.hostname }}{{ . }}{{ end }}" - {{- end }} - {{- with $agent.hostname_item }} - ZBX_HOSTNAMEITEM: {{ . | quote }} - {{- end }} - {{/* If metadata is set, metadata_item is ignored.*/}} - {{- if not $agent.metadata_item }} - {{- with $agent.metadata }} - ZBX_METADATA: {{ . }} - {{- end }} - {{- end }} - {{- with $agent.metadata_item }} - ZBX_METADATAITEM: {{ . | quote }} - {{- end }} - ZBX_TIMEOUT: {{ $agent.timeout | quote }} - ZBX_ENABLEPERSISTENTBUFFER: {{ $agent.enable_persistent_buffer | quote }} - ZBX_PERSISTENTBUFFERPERIOD: {{ $agent.persistent_buffer_period }} - ZBX_LISTENPORT: {{ .Values.service.agent.ports.agent.port | quote }} - ZBX_REFRESHACTIVECHECKS: {{ $agent.refresh_active_checks | quote }} - ZBX_BUFFERSEND: {{ $agent.buffer_send | quote }} - ZBX_BUFFERSIZE: {{ $agent.buffer_size | quote }} - ZBX_UNSAFEUSERPARAMETERS: {{ ternary "1" "0" $agent.unsafe_user_parameters | quote }} - ZBX_TLSCONNECT: {{ $agent.tls_connect }} - ZBX_TLSACCEPT: "{{ range initial $agent.tls_accept }}{{ . }},{{ end }}{{ with last $agent.tls_accept }}{{ . }}{{ end }}" - {{- with $agent.psk_identity }} - ZBX_TLSPSKIDENTITY: {{ . }} - {{- end }} - {{- with $agent.psk_file }} - ZBX_TLSPSKFILE: {{ . }} - {{- end }} - {{- with $agent.allow_key }} - ZBX_ALLOWKEY: {{ . | quote }} - {{- end }} - {{- with $agent.deny_key }} - ZBX_DENYKEY: {{ . | quote }} - {{- end }} - ---- - -{{- $frontend := .Values.zabbix.frontend }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $frontendConfigName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - PHP_TZ: {{ .Values.TZ }} - ZBX_SERVER_HOST: localhost - ZBX_SERVER_PORT: {{ .Values.service.server.ports.server.port | quote }} - ZBX_SERVER_NAME: {{ $frontend.server_name }} - ENABLE_WEB_ACCESS_LOG: {{ $frontend.enable_access_logs | quote }} - ZBX_MAXEXECUTIONTIME: {{ $frontend.max_execution_time | quote }} - ZBX_MEMORYLIMIT: {{ $frontend.memory_limit }} - ZBX_POSTMAXSIZE: {{ $frontend.post_max_size }} - ZBX_UPLOADMAXFILESIZE: {{ $frontend.upload_max_file_size }} - ZBX_MAXINPUTTIME: {{ $frontend.max_input_time | quote }} - ZBX_SESSION_NAME: {{ $frontend.session_name }} - ZBX_DENY_GUI_ACCESS: {{ $frontend.deny_gui_access | quote }} - {{- if $frontend.access_ip_range }} - ZBX_GUI_ACCESS_IP_RANGE: '[{{ range initial $frontend.access_ip_range }}{{ . | quote }},{{ end }}{{ with last $frontend.access_ip_range }}{{ . | quote }}{{ end }}]' - {{- end }} - ZBX_GUI_WARNING_MSG: {{ $frontend.warning_message }} - {{- with $frontend.sso_settings }} - ZBX_SSO_SETTINGS: {{ . | quote }} - {{- end }} - PHP_FPM_PM: {{ $frontend.php_fpm_pm }} - PHP_FPM_PM_MAX_CHILDREN: {{ $frontend.php_fpm_pm_max_children | quote }} - PHP_FPM_PM_START_SERVERS: {{ $frontend.php_fpm_pm_start_servers | quote }} - PHP_FPM_PM_MIN_SPARE_SERVERS: {{ $frontend.php_fpm_pm_min_spare_servers | quote }} - PHP_FPM_PM_MAX_SPARE_SERVERS: {{ $frontend.php_fpm_pm_max_spare_servers | quote }} - PHP_FPM_PM_MAX_REQUESTS: {{ $frontend.php_fpm_pm_max_requests | quote }} - ---- - -{{- $javagateway := .Values.zabbix.javagateway }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $javagatewayConfigName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - ZBX_START_POLLERS: {{ $javagateway.start_pollers | quote }} - ZBX_TIMEOUT: {{ $javagateway.timeout | quote }} - ZBX_DEBUGLEVEL: {{ $javagateway.debug_level }} - ZBX_LISTEN_PORT: {{ .Values.service.javagateway.ports.javagateway.port | quote }} - ---- - -{{- $webservice := .Values.zabbix.webservice }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $webserviceConfigName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - ZBX_LISTENPORT: {{ .Values.service.webservice.ports.webservice.port | quote }} - ZBX_ALLOWEDIP: localhost - ZBX_DEBUGLEVEL: {{ $webservice.debug_level | quote }} - ZBX_TIMEOUT: {{ $webservice.timeout | quote }} -{{- end -}} diff --git a/charts/incubator/zabbix/templates/_frontend.tpl b/charts/incubator/zabbix/templates/_frontend.tpl deleted file mode 100644 index 9f29a63c11b..00000000000 --- a/charts/incubator/zabbix/templates/_frontend.tpl +++ /dev/null @@ -1,43 +0,0 @@ -{{- define "zabbix.frontend" -}} -image: {{ .Values.frontendImage.repository }}:{{ .Values.frontendImage.tag }} -imagePullPolicy: {{ .Values.frontendImage.pullPolicy }} -securityContext: - runAsUser: {{ .Values.podSecurityContext.runAsUser }} - runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} - readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }} - runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }} -envFrom: - - secretRef: - name: '{{ include "tc.common.names.fullname" . }}-common-secret' - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-common-config' - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-frontend-config' -ports: - - containerPort: {{ .Values.service.main.ports.main.targetPort }} - name: main -readinessProbe: - httpGet: - path: / - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }} -livenessProbe: - httpGet: - path: / - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }} -startupProbe: - httpGet: - path: / - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }} -{{- end -}} diff --git a/charts/incubator/zabbix/templates/_javagateway.tpl b/charts/incubator/zabbix/templates/_javagateway.tpl deleted file mode 100644 index a0b3186fad3..00000000000 --- a/charts/incubator/zabbix/templates/_javagateway.tpl +++ /dev/null @@ -1,39 +0,0 @@ -{{- define "zabbix.javagateway" -}} -image: {{ .Values.javaGatewayImage.repository }}:{{ .Values.javaGatewayImage.tag }} -imagePullPolicy: {{ .Values.javaGatewayImage.pullPolicy }} -securityContext: - runAsUser: {{ .Values.podSecurityContext.runAsUser }} - runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} - readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }} - runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }} -volumeMounts: - - name: javagatewaylibs - mountPath: {{ .Values.persistence.javagatewaylibs.mountPath }} -envFrom: - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-javagateway-config' -ports: - - containerPort: {{ .Values.service.javagateway.ports.javagateway.port }} - name: javagateway -readinessProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }} -livenessProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }} -startupProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }} -{{- end -}} diff --git a/charts/incubator/zabbix/templates/_secret.tpl b/charts/incubator/zabbix/templates/_secret.tpl deleted file mode 100644 index d1c6151834f..00000000000 --- a/charts/incubator/zabbix/templates/_secret.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{/* Define the secret */}} -{{- define "zabbix.secret" -}} - -{{- $serverSecretName := printf "%s-server-secret" (include "tc.common.names.fullname" .) }} -{{- $commonSecretName := printf "%s-common-secret" (include "tc.common.names.fullname" .) }} - ---- - -apiVersion: v1 -kind: Secret -type: Opaque -metadata: - name: {{ $commonSecretName }} - labels: - {{- include "tc.common.labels" . | nindent 4 }} -data: - POSTGRES_PASSWORD: {{ .Values.postgresql.postgresqlPassword | trimAll "\"" | b64enc }} -{{- end }} diff --git a/charts/incubator/zabbix/templates/_snmp.tpl b/charts/incubator/zabbix/templates/_snmp.tpl deleted file mode 100644 index 727a10d2613..00000000000 --- a/charts/incubator/zabbix/templates/_snmp.tpl +++ /dev/null @@ -1,38 +0,0 @@ -{{- define "zabbix.snmptraps" -}} -image: {{ .Values.snmptrapsImage.repository }}:{{ .Values.snmptrapsImage.tag }} -imagePullPolicy: {{ .Values.agent2Image.pullPolicy }} -securityContext: - runAsUser: {{ .Values.podSecurityContext.runAsUser }} - runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} - readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }} - runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }} -volumeMounts: - - name: snmptraps - mountPath: {{ .Values.persistence.snmptraps.mountPath }} - - name: snmpmibs - mountPath: {{ .Values.persistence.snmpmibs.mountPath }} -ports: - - containerPort: {{ .Values.service.snmptraps.ports.snmptraps.targetPort }} - name: snmptraps -readinessProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }} -livenessProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }} -startupProbe: - tcpSocket: - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }} -{{- end -}} diff --git a/charts/incubator/zabbix/templates/_webservice.tpl b/charts/incubator/zabbix/templates/_webservice.tpl deleted file mode 100644 index 4b77113e0e7..00000000000 --- a/charts/incubator/zabbix/templates/_webservice.tpl +++ /dev/null @@ -1,39 +0,0 @@ -{{- define "zabbix.webservice" -}} -image: {{ .Values.webServiceImage.repository }}:{{ .Values.webServiceImage.tag }} -imagePullPolicy: {{ .Values.webServiceImage.pullPolicy }} -securityContext: - runAsUser: {{ .Values.podSecurityContext.runAsUser }} - runAsGroup: {{ .Values.podSecurityContext.runAsGroup }} - readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFilesystem }} - runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }} -envFrom: - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-webservice-config' -ports: - - containerPort: {{ .Values.service.webservice.ports.webservice.port }} - name: webservice -readinessProbe: - httpGet: - path: /report - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.readiness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.readiness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.readiness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.readiness.spec.failureThreshold }} -livenessProbe: - httpGet: - path: /report - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.liveness.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.liveness.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.liveness.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.liveness.spec.failureThreshold }} -startupProbe: - httpGet: - path: /report - port: {{ .Values.service.main.ports.main.targetPort }} - initialDelaySeconds: {{ .Values.probes.startup.spec.initialDelaySeconds }} - timeoutSeconds: {{ .Values.probes.startup.spec.timeoutSeconds }} - periodSeconds: {{ .Values.probes.startup.spec.periodSeconds }} - failureThreshold: {{ .Values.probes.startup.spec.failureThreshold }} -{{- end -}} diff --git a/charts/incubator/zabbix/templates/common.yaml b/charts/incubator/zabbix/templates/common.yaml deleted file mode 100644 index 4cb50a22a5e..00000000000 --- a/charts/incubator/zabbix/templates/common.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{/* Make sure all variables are set properly */}} -{{- include "tc.common.loader.init" . }} - -{{/* Render secret */}} -{{- include "zabbix.secret" . }} - -{{/* Render config */}} -{{- include "zabbix.config" . }} - -{{- $_ := set .Values.additionalContainers "frontend" (include "zabbix.frontend" . | fromYaml) -}} - -{{- if .Values.zabbix.agent.enabled -}} -{{- $_ := set .Values.additionalContainers "agent2" (include "zabbix.agent2" . | fromYaml) -}} -{{- end -}} - -{{- if .Values.zabbix.webservice.enabled -}} -{{- $_ := set .Values.additionalContainers "webservice" (include "zabbix.webservice" . | fromYaml) -}} -{{- end -}} - -{{- if .Values.zabbix.snmptraps.enabled -}} -{{- $_ := set .Values.additionalContainers "snmptraps" (include "zabbix.snmptraps" . | fromYaml) -}} -{{- end -}} - -{{- if .Values.zabbix.javagateway.enabled -}} -{{- $_ := set .Values.additionalContainers "javagateway" (include "zabbix.javagateway" . | fromYaml) -}} -{{- end -}} - -{{/* Render the templates */}} -{{ include "tc.common.loader.apply" . }} diff --git a/charts/incubator/zabbix/values.yaml b/charts/incubator/zabbix/values.yaml deleted file mode 100644 index d7c66407280..00000000000 --- a/charts/incubator/zabbix/values.yaml +++ /dev/null @@ -1,297 +0,0 @@ -image: - repository: tccr.io/truecharts/zabbix-server - tag: 6.2.7@sha256:ba3f935dd946093e48e39ff6d797684a98a353b293145af59e50761aea5d9f30 - pullPolicy: IfNotPresent - -frontendImage: - repository: tccr.io/truecharts/zabbix-web - tag: 6.2.7@sha256:0e819e67912de672093ad41b5f140b8d29f094652f5aa395f8e34c6cb6f38922 - pullPolicy: IfNotPresent - -agent2Image: - repository: tccr.io/truecharts/zabbix-agent2 - tag: 6.2.7@sha256:b31bee64d39d81cf8dc0ec34bd75daac27b693f7d3479291db3511cb8134b5cb - pullPolicy: IfNotPresent - -snmptrapsImage: - repository: tccr.io/truecharts/zabbix-snmptraps - tag: 6.2.7@sha256:1f74067d505b3908cd585ee43f9d683abc970954bdfac582a8728ec2a334cdc3 - pullPolicy: IfNotPresent - -javaGatewayImage: - repository: tccr.io/truecharts/zabbix-java-gateway - tag: 6.2.7@sha256:50be517bfa07aec2c8fbd664323cd8cacec203ecab2cee8533cb8c0129cad85d - pullPolicy: IfNotPresent - -webServiceImage: - repository: tccr.io/truecharts/zabbix-web-service - tag: 6.2.7@sha256:104c982c53f062d40b41b80fb280a5ea3e67ede25ab8547e239689f8951fcbc4 - pullPolicy: IfNotPresent - -tty: true - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 1997 - runAsGroup: 0 - -zabbix: - # -- https://www.zabbix.com/documentation/current/en/manual/appendix/config/zabbix_server - server: - listen_backlog: 0 - debug_level: 3 - load_modules: [] - timeout: 4 - service_manager_sync_freq: 60 - start_report_writers: 0 - start_pollers: 5 - start_ipmi_pollers: 0 - start_preprocessors: 3 - start_pollers_unreachable: 1 - start_trappers: 5 - start_pingers: 1 - start_discoverers: 1 - start_history_pollers: 5 - start_http_pollers: 1 - start_obdc_pollers: 1 - start_timers: 1 - start_escalators: 1 - start_alerters: 3 - start_java_pollers: 5 - start_proxy_pollers: 1 - start_db_syncers: 4 - start_lld_processors: 2 - start_vmware_collectors: 0 - vmware_frequency: 60 - vmware_perf_frequency: 60 - vmware_cache_size: 8M - vmware_timeout: 10 - housekeeping_freq: 1 - max_housekeeper_delete: 5000 - problem_housekeeper_freq: 60 - cache_size: 32M - cache_update_freq: 60 - history_cache_size: 16M - history_index_cache_size: 4M - history_storage_date_index: false - trend_cache_size: 4M - trend_function_cache_size: 4M - value_cache_size: 8M - trapper_timeout: 300 - unreachable_period: 45 - unreachable_delay: 15 - unavailable_delay: 60 - log_slow_queries: 3000 - proxy_config_freq: 3600 - proxy_data_freq: 1 - export_file_size: 1G - export_type: [] - stats_allowed_ips: [] - frontend: - server_name: My Zabbix Server - enable_access_logs: true - max_execution_time: 300 - memory_limit: 128M - post_max_size: 16M - upload_max_file_size: 2M - max_input_time: 300 - session_name: zbx_sessionid - deny_gui_access: false - warning_message: Zabbix Server is under maintenance - access_ip_range: [] - # Advanced - sso_settings: "" - php_fpm_pm: dynamic - php_fpm_pm_max_children: 50 - php_fpm_pm_start_servers: 5 - php_fpm_pm_min_spare_servers: 5 - php_fpm_pm_max_spare_servers: 35 - php_fpm_pm_max_requests: 0 - agent: - enabled: true - hostname: - - Zabbix server - hostname_item: "" - metadata: "" - metadata_item: "" - timeout: 3 - enable_persistent_buffer: false - persistent_buffer_period: 1h - refresh_active_checks: 120 - buffer_send: 5 - buffer_size: 100 - unsafe_user_parameters: false - tls_connect: unencrypted - tls_accept: - - unencrypted - psk_identity: "" - psk_file: "" - allow_key: "" - deny_key: "" - javagateway: - enabled: true - start_pollers: 5 - timeout: 3 - debug_level: info - webservice: - enabled: true - debug_level: 3 - timeout: 10 - snmptraps: - enabled: true - -envFrom: - - secretRef: - name: '{{ include "tc.common.names.fullname" . }}-common-secret' - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-common-config' - - configMapRef: - name: '{{ include "tc.common.names.fullname" . }}-server-config' - -service: - main: - ports: - main: - port: 10211 - protocol: HTTP - targetPort: 8080 - server: - enabled: true - ports: - server: - enabled: true - port: 10051 - javagateway: - enabled: true - ports: - javagateway: - enabled: true - port: 10052 - snmptraps: - enabled: true - ports: - snmptraps: - protocol: UDP - enabled: true - port: 162 - targetPort: 1162 - agent: - type: ClusterIP - enabled: true - ports: - agent: - enabled: true - port: 10050 - webservice: - type: ClusterIP - enabled: true - ports: - webservice: - enabled: true - protocol: HTTP - port: 10053 - -probes: - liveness: - port: "{{ .Values.service.server.ports.server.port }}" - readiness: - port: "{{ .Values.service.server.ports.server.port }}" - startup: - port: "{{ .Values.service.server.ports.server.port }}" - -persistence: - # Server - serveralertscripts: - enabled: true - mountPath: "/usr/lib/zabbix/alertscripts" - size: 256Gi - serverexternalscripts: - enabled: true - mountPath: "/usr/lib/zabbix/externalscripts" - size: 256Gi - servermodules: - enabled: true - mountPath: "/var/lib/zabbix/modules" - size: 256Gi - serverenc: - enabled: true - mountPath: "/var/lib/zabbix/enc" - size: 256Gi - serversshkeys: - enabled: true - mountPath: "/var/lib/zabbix/ssh_keys" - size: 256Gi - serversslcerts: - enabled: true - mountPath: "/var/lib/zabbix/ssl/certs" - size: 256Gi - serversslkeys: - enabled: true - mountPath: "/var/lib/zabbix/ssl/keys" - size: 256Gi - serversslca: - enabled: true - mountPath: "/var/lib/zabbix/ssl/ssl_ca" - size: 256Gi - serverexport: - # Used with conjunction of .Values.zabbix.server.export_file_size - enabled: true - mountPath: "/var/lib/zabbix/export" - size: 256Gi - # SNMP Traps and Server - snmptraps: - enabled: true - mountPath: /var/lib/zabbix/snmptraps - size: 256Gi - snmpmibs: - enabled: true - mountPath: /var/lib/zabbix/mibs - size: 256Gi - # Agent2 Volumes - hostproc: - enabled: true - noMount: true - readOnly: true - type: hostPath - hostPath: /proc - mountPath: /host/proc - hostsys: - enabled: true - noMount: true - readOnly: true - type: hostPath - hostPath: /sys - mountPath: /host/sys - agentconf: - enabled: true - noMount: true - mountPath: /etc/zabbix/zabbix_agentd.d - size: 256Gi - agentenc: - enabled: true - noMount: true - mountPath: /var/lib/zabbix/enc - size: 256Gi - agentbuffer: - enabled: true - noMount: true - mountPath: /var/lib/zabbix/buffer - size: 256Gi - # Java Gateway - javagatewaylibs: - enabled: true - noMount: true - mountPath: /usr/sbin/zabbix_java/ext_lib - size: 256Gi - -postgresql: - enabled: true - existingSecret: "dbcreds" - postgresqlUsername: zabbix - postgresqlDatabase: zabbix - -portal: - enabled: true