Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Initial version of Kubernetes special agent with first checks

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c673d83cfc4729b8f7a6ead4b6872a0d810fd46f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c673d83cfc4729… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Oct 19 09:35:23 2018 +0200 Initial version of Kubernetes special agent with first checks This commit adds an initial version of the kubernetes special agent as well as some checks on the cluster and node level. Furthermore YAML file to add a check_mk cluster role is added to the treasures. Automatically generated stubs with some minor modifications are added for the kubernetes module as well to support type checking with mypy. CMK-1170 Change-Id: If4bb658418169d423a92257ba6868eb8050e1169 --- agents/special/agent_kubernetes | 538 ++++++++++++++++++ checkman/k8s_component_statuses | 15 + checkman/k8s_namespaces | 14 + checkman/k8s_nodes | 11 + checkman/k8s_persistent_volume_claims | 15 + checkman/k8s_persistent_volumes | 14 + checkman/k8s_resources.cpu | 11 + checkman/k8s_resources.memory | 11 + checkman/k8s_resources.pods | 11 + checkman/k8s_roles | 14 + checkman/k8s_storage_classes | 14 + checks/agent_kubernetes | 41 ++ checks/k8s_component_statuses | 54 ++ checks/k8s_namespaces | 53 ++ checks/k8s_nodes | 48 ++ checks/k8s_persistent_volume_claims | 64 +++ checks/k8s_persistent_volumes | 61 ++ checks/k8s_resources | 103 ++++ checks/k8s_roles | 55 ++ checks/k8s_storage_classes | 54 ++ cmk/gui/plugins/metrics/check_mk.py | 6 + cmk/gui/plugins/wato/datasource_programs.py | 24 + doc/treasures/kubernetes/check_mk_rbac.yaml | 72 +++ tests/static/Makefile | 3 +- tests/static/typeshed/kubernetes/__init__.pyi | 5 + .../static/typeshed/kubernetes/client/__init__.pyi | 617 +++++++++++++++++++++ .../typeshed/kubernetes/client/api_client.pyi | 33 ++ .../typeshed/kubernetes/client/apis/__init__.pyi | 61 ++ .../client/apis/admissionregistration_api.pyi | 12 + .../apis/admissionregistration_v1alpha1_api.pyi | 26 + .../apis/admissionregistration_v1beta1_api.pyi | 40 ++ .../kubernetes/client/apis/apiextensions_api.pyi | 12 + .../client/apis/apiextensions_v1beta1_api.pyi | 32 ++ .../kubernetes/client/apis/apiregistration_api.pyi | 12 + .../client/apis/apiregistration_v1_api.pyi | 32 ++ .../client/apis/apiregistration_v1beta1_api.pyi | 32 ++ .../typeshed/kubernetes/client/apis/apis_api.pyi | 12 + .../typeshed/kubernetes/client/apis/apps_api.pyi | 12 + .../kubernetes/client/apis/apps_v1_api.pyi | 134 +++++ .../kubernetes/client/apis/apps_v1beta1_api.pyi | 86 +++ .../kubernetes/client/apis/apps_v1beta2_api.pyi | 134 +++++ .../kubernetes/client/apis/authentication_api.pyi | 12 + .../client/apis/authentication_v1_api.pyi | 14 + .../client/apis/authentication_v1beta1_api.pyi | 14 + .../kubernetes/client/apis/authorization_api.pyi | 12 + .../client/apis/authorization_v1_api.pyi | 20 + .../client/apis/authorization_v1beta1_api.pyi | 20 + .../kubernetes/client/apis/autoscaling_api.pyi | 12 + .../kubernetes/client/apis/autoscaling_v1_api.pyi | 34 ++ .../client/apis/autoscaling_v2beta1_api.pyi | 34 ++ .../client/apis/autoscaling_v2beta2_api.pyi | 34 ++ .../typeshed/kubernetes/client/apis/batch_api.pyi | 12 + .../kubernetes/client/apis/batch_v1_api.pyi | 34 ++ .../kubernetes/client/apis/batch_v1beta1_api.pyi | 34 ++ .../kubernetes/client/apis/batch_v2alpha1_api.pyi | 34 ++ .../kubernetes/client/apis/certificates_api.pyi | 12 + .../client/apis/certificates_v1beta1_api.pyi | 34 ++ .../kubernetes/client/apis/coordination_api.pyi | 12 + .../client/apis/coordination_v1beta1_api.pyi | 28 + .../typeshed/kubernetes/client/apis/core_api.pyi | 12 + .../kubernetes/client/apis/core_v1_api.pyi | 407 ++++++++++++++ .../kubernetes/client/apis/custom_objects_api.pyi | 58 ++ .../typeshed/kubernetes/client/apis/events_api.pyi | 12 + .../kubernetes/client/apis/events_v1beta1_api.pyi | 28 + .../kubernetes/client/apis/extensions_api.pyi | 12 + .../client/apis/extensions_v1beta1_api.pyi | 150 +++++ .../typeshed/kubernetes/client/apis/logs_api.pyi | 14 + .../kubernetes/client/apis/networking_api.pyi | 12 + .../kubernetes/client/apis/networking_v1_api.pyi | 28 + .../typeshed/kubernetes/client/apis/policy_api.pyi | 12 + .../kubernetes/client/apis/policy_v1beta1_api.pyi | 48 ++ .../client/apis/rbac_authorization_api.pyi | 12 + .../client/apis/rbac_authorization_v1_api.pyi | 73 +++ .../apis/rbac_authorization_v1alpha1_api.pyi | 72 +++ .../client/apis/rbac_authorization_v1beta1_api.pyi | 72 +++ .../kubernetes/client/apis/scheduling_api.pyi | 12 + .../client/apis/scheduling_v1alpha1_api.pyi | 26 + .../client/apis/scheduling_v1beta1_api.pyi | 26 + .../kubernetes/client/apis/settings_api.pyi | 12 + .../client/apis/settings_v1alpha1_api.pyi | 28 + .../kubernetes/client/apis/storage_api.pyi | 12 + .../kubernetes/client/apis/storage_v1_api.pyi | 27 + .../client/apis/storage_v1alpha1_api.pyi | 26 + .../kubernetes/client/apis/storage_v1beta1_api.pyi | 40 ++ .../kubernetes/client/apis/version_api.pyi | 12 + .../typeshed/kubernetes/client/configuration.pyi | 50 ++ .../typeshed/kubernetes/client/models/__init__.pyi | 558 +++++++++++++++++++ ...ssionregistration_v1beta1_service_reference.pyi | 30 + .../apiregistration_v1beta1_service_reference.pyi | 25 + .../client/models/apps_v1beta1_deployment.pyi | 40 ++ .../models/apps_v1beta1_deployment_condition.pyi | 45 ++ .../client/models/apps_v1beta1_deployment_list.pyi | 35 ++ .../models/apps_v1beta1_deployment_rollback.pyi | 40 ++ .../client/models/apps_v1beta1_deployment_spec.pyi | 60 ++ .../models/apps_v1beta1_deployment_status.pyi | 55 ++ .../models/apps_v1beta1_deployment_strategy.pyi | 25 + .../client/models/apps_v1beta1_rollback_config.pyi | 20 + .../apps_v1beta1_rolling_update_deployment.pyi | 25 + .../client/models/apps_v1beta1_scale.pyi | 40 ++ .../client/models/apps_v1beta1_scale_spec.pyi | 20 + .../client/models/apps_v1beta1_scale_status.pyi | 30 + .../extensions_v1beta1_allowed_flex_volume.pyi | 20 + .../extensions_v1beta1_allowed_host_path.pyi | 25 + .../models/extensions_v1beta1_deployment.pyi | 40 ++ .../extensions_v1beta1_deployment_condition.pyi | 45 ++ .../models/extensions_v1beta1_deployment_list.pyi | 35 ++ .../extensions_v1beta1_deployment_rollback.pyi | 40 ++ .../models/extensions_v1beta1_deployment_spec.pyi | 60 ++ .../extensions_v1beta1_deployment_status.pyi | 55 ++ .../extensions_v1beta1_deployment_strategy.pyi | 25 + ...xtensions_v1beta1_fs_group_strategy_options.pyi | 25 + .../models/extensions_v1beta1_host_port_range.pyi | 25 + .../client/models/extensions_v1beta1_id_range.pyi | 25 + .../extensions_v1beta1_pod_security_policy.pyi | 35 ++ ...extensions_v1beta1_pod_security_policy_list.pyi | 35 ++ ...extensions_v1beta1_pod_security_policy_spec.pyi | 120 ++++ .../models/extensions_v1beta1_rollback_config.pyi | 20 + ...xtensions_v1beta1_rolling_update_deployment.pyi | 25 + ...nsions_v1beta1_run_as_user_strategy_options.pyi | 25 + .../client/models/extensions_v1beta1_scale.pyi | 40 ++ .../models/extensions_v1beta1_scale_spec.pyi | 20 + .../models/extensions_v1beta1_scale_status.pyi | 30 + ...xtensions_v1beta1_se_linux_strategy_options.pyi | 25 + ...1beta1_supplemental_groups_strategy_options.pyi | 25 + .../models/policy_v1beta1_allowed_flex_volume.pyi | 20 + .../models/policy_v1beta1_allowed_host_path.pyi | 25 + .../policy_v1beta1_fs_group_strategy_options.pyi | 25 + .../models/policy_v1beta1_host_port_range.pyi | 25 + .../client/models/policy_v1beta1_id_range.pyi | 25 + .../models/policy_v1beta1_pod_security_policy.pyi | 35 ++ .../policy_v1beta1_pod_security_policy_list.pyi | 35 ++ .../policy_v1beta1_pod_security_policy_spec.pyi | 120 ++++ ...policy_v1beta1_run_as_user_strategy_options.pyi | 25 + .../policy_v1beta1_se_linux_strategy_options.pyi | 25 + ...1beta1_supplemental_groups_strategy_options.pyi | 25 + .../client/models/runtime_raw_extension.pyi | 20 + .../kubernetes/client/models/v1_affinity.pyi | 30 + .../client/models/v1_aggregation_rule.pyi | 20 + .../kubernetes/client/models/v1_api_group.pyi | 45 ++ .../kubernetes/client/models/v1_api_group_list.pyi | 30 + .../kubernetes/client/models/v1_api_resource.pyi | 60 ++ .../client/models/v1_api_resource_list.pyi | 35 ++ .../kubernetes/client/models/v1_api_service.pyi | 40 ++ .../client/models/v1_api_service_condition.pyi | 40 ++ .../client/models/v1_api_service_list.pyi | 35 ++ .../client/models/v1_api_service_spec.pyi | 50 ++ .../client/models/v1_api_service_status.pyi | 20 + .../kubernetes/client/models/v1_api_versions.pyi | 35 ++ .../client/models/v1_attached_volume.pyi | 25 + .../v1_aws_elastic_block_store_volume_source.pyi | 35 ++ .../client/models/v1_azure_disk_volume_source.pyi | 45 ++ .../v1_azure_file_persistent_volume_source.pyi | 35 ++ .../client/models/v1_azure_file_volume_source.pyi | 30 + .../kubernetes/client/models/v1_binding.pyi | 35 ++ .../kubernetes/client/models/v1_capabilities.pyi | 25 + .../models/v1_ceph_fs_persistent_volume_source.pyi | 45 ++ .../client/models/v1_ceph_fs_volume_source.pyi | 45 ++ .../models/v1_cinder_persistent_volume_source.pyi | 35 ++ .../client/models/v1_cinder_volume_source.pyi | 35 ++ .../client/models/v1_client_ip_config.pyi | 20 + .../kubernetes/client/models/v1_cluster_role.pyi | 40 ++ .../client/models/v1_cluster_role_binding.pyi | 40 ++ .../client/models/v1_cluster_role_binding_list.pyi | 35 ++ .../client/models/v1_cluster_role_list.pyi | 36 ++ .../client/models/v1_component_condition.pyi | 35 ++ .../client/models/v1_component_status.pyi | 36 ++ .../client/models/v1_component_status_list.pyi | 36 ++ .../kubernetes/client/models/v1_config_map.pyi | 40 ++ .../client/models/v1_config_map_env_source.pyi | 25 + .../client/models/v1_config_map_key_selector.pyi | 30 + .../client/models/v1_config_map_list.pyi | 35 ++ .../models/v1_config_map_node_config_source.pyi | 40 ++ .../client/models/v1_config_map_projection.pyi | 30 + .../client/models/v1_config_map_volume_source.pyi | 35 ++ .../kubernetes/client/models/v1_container.pyi | 120 ++++ .../client/models/v1_container_image.pyi | 25 + .../kubernetes/client/models/v1_container_port.pyi | 40 ++ .../client/models/v1_container_state.pyi | 30 + .../client/models/v1_container_state_running.pyi | 20 + .../models/v1_container_state_terminated.pyi | 50 ++ .../client/models/v1_container_state_waiting.pyi | 25 + .../client/models/v1_container_status.pyi | 55 ++ .../client/models/v1_controller_revision.pyi | 40 ++ .../client/models/v1_controller_revision_list.pyi | 35 ++ .../models/v1_cross_version_object_reference.pyi | 30 + .../models/v1_csi_persistent_volume_source.pyi | 55 ++ .../client/models/v1_daemon_endpoint.pyi | 20 + .../kubernetes/client/models/v1_daemon_set.pyi | 40 ++ .../client/models/v1_daemon_set_condition.pyi | 40 ++ .../client/models/v1_daemon_set_list.pyi | 35 ++ .../client/models/v1_daemon_set_spec.pyi | 40 ++ .../client/models/v1_daemon_set_status.pyi | 65 +++ .../models/v1_daemon_set_update_strategy.pyi | 25 + .../kubernetes/client/models/v1_delete_options.pyi | 50 ++ .../kubernetes/client/models/v1_deployment.pyi | 40 ++ .../client/models/v1_deployment_condition.pyi | 45 ++ .../client/models/v1_deployment_list.pyi | 35 ++ .../client/models/v1_deployment_spec.pyi | 55 ++ .../client/models/v1_deployment_status.pyi | 55 ++ .../client/models/v1_deployment_strategy.pyi | 25 + .../client/models/v1_downward_api_projection.pyi | 20 + .../client/models/v1_downward_api_volume_file.pyi | 35 ++ .../models/v1_downward_api_volume_source.pyi | 25 + .../client/models/v1_empty_dir_volume_source.pyi | 25 + .../client/models/v1_endpoint_address.pyi | 35 ++ .../kubernetes/client/models/v1_endpoint_port.pyi | 30 + .../client/models/v1_endpoint_subset.pyi | 30 + .../kubernetes/client/models/v1_endpoints.pyi | 35 ++ .../kubernetes/client/models/v1_endpoints_list.pyi | 35 ++ .../client/models/v1_env_from_source.pyi | 30 + .../kubernetes/client/models/v1_env_var.pyi | 30 + .../kubernetes/client/models/v1_env_var_source.pyi | 35 ++ .../typeshed/kubernetes/client/models/v1_event.pyi | 100 ++++ .../kubernetes/client/models/v1_event_list.pyi | 35 ++ .../kubernetes/client/models/v1_event_series.pyi | 30 + .../kubernetes/client/models/v1_event_source.pyi | 25 + .../kubernetes/client/models/v1_exec_action.pyi | 20 + .../client/models/v1_fc_volume_source.pyi | 40 ++ .../models/v1_flex_persistent_volume_source.pyi | 40 ++ .../client/models/v1_flex_volume_source.pyi | 40 ++ .../client/models/v1_flocker_volume_source.pyi | 25 + .../v1_gce_persistent_disk_volume_source.pyi | 35 ++ .../client/models/v1_git_repo_volume_source.pyi | 30 + .../client/models/v1_glusterfs_volume_source.pyi | 30 + .../models/v1_group_version_for_discovery.pyi | 25 + .../kubernetes/client/models/v1_handler.pyi | 25 + .../client/models/v1_horizontal_pod_autoscaler.pyi | 40 ++ .../models/v1_horizontal_pod_autoscaler_list.pyi | 35 ++ .../models/v1_horizontal_pod_autoscaler_spec.pyi | 35 ++ .../models/v1_horizontal_pod_autoscaler_status.pyi | 40 ++ .../kubernetes/client/models/v1_host_alias.pyi | 25 + .../client/models/v1_host_path_volume_source.pyi | 25 + .../client/models/v1_http_get_action.pyi | 40 ++ .../kubernetes/client/models/v1_http_header.pyi | 25 + .../kubernetes/client/models/v1_initializer.pyi | 20 + .../kubernetes/client/models/v1_initializers.pyi | 25 + .../kubernetes/client/models/v1_ip_block.pyi | 20 + .../models/v1_iscsi_persistent_volume_source.pyi | 70 +++ .../client/models/v1_iscsi_volume_source.pyi | 70 +++ .../typeshed/kubernetes/client/models/v1_job.pyi | 40 ++ .../kubernetes/client/models/v1_job_condition.pyi | 45 ++ .../kubernetes/client/models/v1_job_list.pyi | 35 ++ .../kubernetes/client/models/v1_job_spec.pyi | 55 ++ .../kubernetes/client/models/v1_job_status.pyi | 45 ++ .../kubernetes/client/models/v1_key_to_path.pyi | 30 + .../kubernetes/client/models/v1_label_selector.pyi | 25 + .../models/v1_label_selector_requirement.pyi | 30 + .../kubernetes/client/models/v1_lifecycle.pyi | 25 + .../kubernetes/client/models/v1_limit_range.pyi | 35 ++ .../client/models/v1_limit_range_item.pyi | 45 ++ .../client/models/v1_limit_range_list.pyi | 35 ++ .../client/models/v1_limit_range_spec.pyi | 20 + .../kubernetes/client/models/v1_list_meta.pyi | 25 + .../client/models/v1_load_balancer_ingress.pyi | 25 + .../client/models/v1_load_balancer_status.pyi | 20 + .../client/models/v1_local_object_reference.pyi | 20 + .../models/v1_local_subject_access_review.pyi | 40 ++ .../client/models/v1_local_volume_source.pyi | 25 + .../kubernetes/client/models/v1_namespace.pyi | 40 ++ .../kubernetes/client/models/v1_namespace_list.pyi | 36 ++ .../kubernetes/client/models/v1_namespace_spec.pyi | 20 + .../client/models/v1_namespace_status.pyi | 20 + .../kubernetes/client/models/v1_network_policy.pyi | 35 ++ .../models/v1_network_policy_egress_rule.pyi | 25 + .../models/v1_network_policy_ingress_rule.pyi | 20 + .../client/models/v1_network_policy_list.pyi | 35 ++ .../client/models/v1_network_policy_peer.pyi | 30 + .../client/models/v1_network_policy_port.pyi | 25 + .../client/models/v1_network_policy_spec.pyi | 35 ++ .../client/models/v1_nfs_volume_source.pyi | 30 + .../typeshed/kubernetes/client/models/v1_node.pyi | 41 ++ .../kubernetes/client/models/v1_node_address.pyi | 25 + .../kubernetes/client/models/v1_node_affinity.pyi | 25 + .../kubernetes/client/models/v1_node_condition.pyi | 45 ++ .../client/models/v1_node_config_source.pyi | 20 + .../client/models/v1_node_config_status.pyi | 35 ++ .../client/models/v1_node_daemon_endpoints.pyi | 20 + .../kubernetes/client/models/v1_node_list.pyi | 36 ++ .../kubernetes/client/models/v1_node_selector.pyi | 20 + .../client/models/v1_node_selector_requirement.pyi | 30 + .../client/models/v1_node_selector_term.pyi | 25 + .../kubernetes/client/models/v1_node_spec.pyi | 45 ++ .../kubernetes/client/models/v1_node_status.pyi | 71 +++ .../client/models/v1_node_system_info.pyi | 65 +++ .../client/models/v1_non_resource_attributes.pyi | 25 + .../client/models/v1_non_resource_rule.pyi | 25 + .../client/models/v1_object_field_selector.pyi | 25 + .../kubernetes/client/models/v1_object_meta.pyi | 95 ++++ .../client/models/v1_object_reference.pyi | 50 ++ .../client/models/v1_owner_reference.pyi | 45 ++ .../client/models/v1_persistent_volume.pyi | 40 ++ .../client/models/v1_persistent_volume_claim.pyi | 40 ++ .../v1_persistent_volume_claim_condition.pyi | 45 ++ .../models/v1_persistent_volume_claim_list.pyi | 36 ++ .../models/v1_persistent_volume_claim_spec.pyi | 50 ++ .../models/v1_persistent_volume_claim_status.pyi | 35 ++ .../v1_persistent_volume_claim_volume_source.pyi | 25 + .../client/models/v1_persistent_volume_list.pyi | 36 ++ .../client/models/v1_persistent_volume_spec.pyi | 165 ++++++ .../client/models/v1_persistent_volume_status.pyi | 30 + .../v1_photon_persistent_disk_volume_source.pyi | 25 + .../typeshed/kubernetes/client/models/v1_pod.pyi | 41 ++ .../kubernetes/client/models/v1_pod_affinity.pyi | 25 + .../client/models/v1_pod_affinity_term.pyi | 30 + .../client/models/v1_pod_anti_affinity.pyi | 25 + .../kubernetes/client/models/v1_pod_condition.pyi | 45 ++ .../kubernetes/client/models/v1_pod_dns_config.pyi | 30 + .../client/models/v1_pod_dns_config_option.pyi | 25 + .../kubernetes/client/models/v1_pod_list.pyi | 36 ++ .../client/models/v1_pod_readiness_gate.pyi | 20 + .../client/models/v1_pod_security_context.pyi | 50 ++ .../kubernetes/client/models/v1_pod_spec.pyi | 160 ++++++ .../kubernetes/client/models/v1_pod_status.pyi | 70 +++ .../kubernetes/client/models/v1_pod_template.pyi | 35 ++ .../client/models/v1_pod_template_list.pyi | 35 ++ .../client/models/v1_pod_template_spec.pyi | 25 + .../kubernetes/client/models/v1_policy_rule.pyi | 40 ++ .../client/models/v1_portworx_volume_source.pyi | 30 + .../kubernetes/client/models/v1_preconditions.pyi | 20 + .../client/models/v1_preferred_scheduling_term.pyi | 25 + .../typeshed/kubernetes/client/models/v1_probe.pyi | 50 ++ .../client/models/v1_projected_volume_source.pyi | 25 + .../client/models/v1_quobyte_volume_source.pyi | 40 ++ .../models/v1_rbd_persistent_volume_source.pyi | 55 ++ .../client/models/v1_rbd_volume_source.pyi | 55 ++ .../kubernetes/client/models/v1_replica_set.pyi | 40 ++ .../client/models/v1_replica_set_condition.pyi | 40 ++ .../client/models/v1_replica_set_list.pyi | 35 ++ .../client/models/v1_replica_set_spec.pyi | 35 ++ .../client/models/v1_replica_set_status.pyi | 45 ++ .../client/models/v1_replication_controller.pyi | 40 ++ .../models/v1_replication_controller_condition.pyi | 40 ++ .../models/v1_replication_controller_list.pyi | 35 ++ .../models/v1_replication_controller_spec.pyi | 35 ++ .../models/v1_replication_controller_status.pyi | 45 ++ .../client/models/v1_resource_attributes.pyi | 50 ++ .../client/models/v1_resource_field_selector.pyi | 30 + .../kubernetes/client/models/v1_resource_quota.pyi | 40 ++ .../client/models/v1_resource_quota_list.pyi | 35 ++ .../client/models/v1_resource_quota_spec.pyi | 30 + .../client/models/v1_resource_quota_status.pyi | 25 + .../client/models/v1_resource_requirements.pyi | 25 + .../kubernetes/client/models/v1_resource_rule.pyi | 35 ++ .../typeshed/kubernetes/client/models/v1_role.pyi | 35 ++ .../kubernetes/client/models/v1_role_binding.pyi | 40 ++ .../client/models/v1_role_binding_list.pyi | 35 ++ .../kubernetes/client/models/v1_role_list.pyi | 36 ++ .../kubernetes/client/models/v1_role_ref.pyi | 30 + .../client/models/v1_rolling_update_daemon_set.pyi | 20 + .../client/models/v1_rolling_update_deployment.pyi | 25 + .../v1_rolling_update_stateful_set_strategy.pyi | 20 + .../typeshed/kubernetes/client/models/v1_scale.pyi | 40 ++ .../v1_scale_io_persistent_volume_source.pyi | 65 +++ .../client/models/v1_scale_io_volume_source.pyi | 65 +++ .../kubernetes/client/models/v1_scale_spec.pyi | 20 + .../kubernetes/client/models/v1_scale_status.pyi | 25 + .../kubernetes/client/models/v1_scope_selector.pyi | 20 + .../v1_scoped_resource_selector_requirement.pyi | 30 + .../client/models/v1_se_linux_options.pyi | 35 ++ .../kubernetes/client/models/v1_secret.pyi | 45 ++ .../client/models/v1_secret_env_source.pyi | 25 + .../client/models/v1_secret_key_selector.pyi | 30 + .../kubernetes/client/models/v1_secret_list.pyi | 35 ++ .../client/models/v1_secret_projection.pyi | 30 + .../client/models/v1_secret_reference.pyi | 25 + .../client/models/v1_secret_volume_source.pyi | 35 ++ .../client/models/v1_security_context.pyi | 60 ++ .../models/v1_self_subject_access_review.pyi | 40 ++ .../models/v1_self_subject_access_review_spec.pyi | 25 + .../client/models/v1_self_subject_rules_review.pyi | 40 ++ .../models/v1_self_subject_rules_review_spec.pyi | 20 + .../models/v1_server_address_by_client_cidr.pyi | 25 + .../kubernetes/client/models/v1_service.pyi | 40 ++ .../client/models/v1_service_account.pyi | 45 ++ .../client/models/v1_service_account_list.pyi | 35 ++ .../models/v1_service_account_token_projection.pyi | 30 + .../kubernetes/client/models/v1_service_list.pyi | 35 ++ .../kubernetes/client/models/v1_service_port.pyi | 40 ++ .../client/models/v1_service_reference.pyi | 25 + .../kubernetes/client/models/v1_service_spec.pyi | 80 +++ .../kubernetes/client/models/v1_service_status.pyi | 20 + .../client/models/v1_session_affinity_config.pyi | 20 + .../kubernetes/client/models/v1_stateful_set.pyi | 40 ++ .../client/models/v1_stateful_set_condition.pyi | 40 ++ .../client/models/v1_stateful_set_list.pyi | 35 ++ .../client/models/v1_stateful_set_spec.pyi | 55 ++ .../client/models/v1_stateful_set_status.pyi | 60 ++ .../models/v1_stateful_set_update_strategy.pyi | 25 + .../kubernetes/client/models/v1_status.pyi | 55 ++ .../kubernetes/client/models/v1_status_cause.pyi | 30 + .../kubernetes/client/models/v1_status_details.pyi | 45 ++ .../kubernetes/client/models/v1_storage_class.pyi | 65 +++ .../client/models/v1_storage_class_list.pyi | 36 ++ .../v1_storage_os_persistent_volume_source.pyi | 40 ++ .../client/models/v1_storage_os_volume_source.pyi | 40 ++ .../kubernetes/client/models/v1_subject.pyi | 35 ++ .../client/models/v1_subject_access_review.pyi | 40 ++ .../models/v1_subject_access_review_spec.pyi | 45 ++ .../models/v1_subject_access_review_status.pyi | 35 ++ .../models/v1_subject_rules_review_status.pyi | 35 ++ .../kubernetes/client/models/v1_sysctl.pyi | 25 + .../typeshed/kubernetes/client/models/v1_taint.pyi | 35 ++ .../client/models/v1_tcp_socket_action.pyi | 25 + .../kubernetes/client/models/v1_token_review.pyi | 40 ++ .../client/models/v1_token_review_spec.pyi | 20 + .../client/models/v1_token_review_status.pyi | 30 + .../kubernetes/client/models/v1_toleration.pyi | 40 ++ .../v1_topology_selector_label_requirement.pyi | 25 + .../client/models/v1_topology_selector_term.pyi | 20 + .../models/v1_typed_local_object_reference.pyi | 30 + .../kubernetes/client/models/v1_user_info.pyi | 35 ++ .../kubernetes/client/models/v1_volume.pyi | 155 ++++++ .../kubernetes/client/models/v1_volume_device.pyi | 25 + .../kubernetes/client/models/v1_volume_mount.pyi | 40 ++ .../client/models/v1_volume_node_affinity.pyi | 20 + .../client/models/v1_volume_projection.pyi | 35 ++ .../v1_vsphere_virtual_disk_volume_source.pyi | 35 ++ .../kubernetes/client/models/v1_watch_event.pyi | 25 + .../models/v1_weighted_pod_affinity_term.pyi | 25 + .../client/models/v1alpha1_aggregation_rule.pyi | 20 + .../client/models/v1alpha1_cluster_role.pyi | 40 ++ .../models/v1alpha1_cluster_role_binding.pyi | 40 ++ .../models/v1alpha1_cluster_role_binding_list.pyi | 35 ++ .../client/models/v1alpha1_cluster_role_list.pyi | 35 ++ .../client/models/v1alpha1_initializer.pyi | 25 + .../models/v1alpha1_initializer_configuration.pyi | 35 ++ .../v1alpha1_initializer_configuration_list.pyi | 35 ++ .../client/models/v1alpha1_pod_preset.pyi | 35 ++ .../client/models/v1alpha1_pod_preset_list.pyi | 35 ++ .../client/models/v1alpha1_pod_preset_spec.pyi | 40 ++ .../client/models/v1alpha1_policy_rule.pyi | 40 ++ .../client/models/v1alpha1_priority_class.pyi | 45 ++ .../client/models/v1alpha1_priority_class_list.pyi | 35 ++ .../kubernetes/client/models/v1alpha1_role.pyi | 35 ++ .../client/models/v1alpha1_role_binding.pyi | 40 ++ .../client/models/v1alpha1_role_binding_list.pyi | 35 ++ .../client/models/v1alpha1_role_list.pyi | 35 ++ .../kubernetes/client/models/v1alpha1_role_ref.pyi | 30 + .../kubernetes/client/models/v1alpha1_rule.pyi | 30 + .../kubernetes/client/models/v1alpha1_subject.pyi | 35 ++ .../client/models/v1alpha1_volume_attachment.pyi | 40 ++ .../models/v1alpha1_volume_attachment_list.pyi | 35 ++ .../models/v1alpha1_volume_attachment_source.pyi | 20 + .../models/v1alpha1_volume_attachment_spec.pyi | 30 + .../models/v1alpha1_volume_attachment_status.pyi | 35 ++ .../client/models/v1alpha1_volume_error.pyi | 25 + .../client/models/v1beta1_aggregation_rule.pyi | 20 + .../client/models/v1beta1_api_service.pyi | 40 ++ .../models/v1beta1_api_service_condition.pyi | 40 ++ .../client/models/v1beta1_api_service_list.pyi | 35 ++ .../client/models/v1beta1_api_service_spec.pyi | 50 ++ .../client/models/v1beta1_api_service_status.pyi | 20 + .../models/v1beta1_certificate_signing_request.pyi | 40 ++ ...beta1_certificate_signing_request_condition.pyi | 35 ++ .../v1beta1_certificate_signing_request_list.pyi | 35 ++ .../v1beta1_certificate_signing_request_spec.pyi | 45 ++ .../v1beta1_certificate_signing_request_status.pyi | 25 + .../client/models/v1beta1_cluster_role.pyi | 40 ++ .../client/models/v1beta1_cluster_role_binding.pyi | 40 ++ .../models/v1beta1_cluster_role_binding_list.pyi | 35 ++ .../client/models/v1beta1_cluster_role_list.pyi | 35 ++ .../client/models/v1beta1_controller_revision.pyi | 40 ++ .../models/v1beta1_controller_revision_list.pyi | 35 ++ .../kubernetes/client/models/v1beta1_cron_job.pyi | 40 ++ .../client/models/v1beta1_cron_job_list.pyi | 35 ++ .../client/models/v1beta1_cron_job_spec.pyi | 50 ++ .../client/models/v1beta1_cron_job_status.pyi | 25 + .../v1beta1_custom_resource_column_definition.pyi | 45 ++ .../models/v1beta1_custom_resource_definition.pyi | 40 ++ ...1beta1_custom_resource_definition_condition.pyi | 40 ++ .../v1beta1_custom_resource_definition_list.pyi | 35 ++ .../v1beta1_custom_resource_definition_names.pyi | 45 ++ .../v1beta1_custom_resource_definition_spec.pyi | 55 ++ .../v1beta1_custom_resource_definition_status.pyi | 30 + .../v1beta1_custom_resource_definition_version.pyi | 30 + .../v1beta1_custom_resource_subresource_scale.pyi | 30 + .../v1beta1_custom_resource_subresources.pyi | 25 + .../models/v1beta1_custom_resource_validation.pyi | 20 + .../client/models/v1beta1_daemon_set.pyi | 40 ++ .../client/models/v1beta1_daemon_set_condition.pyi | 40 ++ .../client/models/v1beta1_daemon_set_list.pyi | 35 ++ .../client/models/v1beta1_daemon_set_spec.pyi | 45 ++ .../client/models/v1beta1_daemon_set_status.pyi | 65 +++ .../models/v1beta1_daemon_set_update_strategy.pyi | 25 + .../kubernetes/client/models/v1beta1_event.pyi | 100 ++++ .../client/models/v1beta1_event_list.pyi | 35 ++ .../client/models/v1beta1_event_series.pyi | 30 + .../kubernetes/client/models/v1beta1_eviction.pyi | 35 ++ .../models/v1beta1_external_documentation.pyi | 25 + .../client/models/v1beta1_http_ingress_path.pyi | 25 + .../models/v1beta1_http_ingress_rule_value.pyi | 20 + .../kubernetes/client/models/v1beta1_ingress.pyi | 40 ++ .../client/models/v1beta1_ingress_backend.pyi | 25 + .../client/models/v1beta1_ingress_list.pyi | 35 ++ .../client/models/v1beta1_ingress_rule.pyi | 25 + .../client/models/v1beta1_ingress_spec.pyi | 30 + .../client/models/v1beta1_ingress_status.pyi | 20 + .../client/models/v1beta1_ingress_tls.pyi | 25 + .../kubernetes/client/models/v1beta1_ip_block.pyi | 20 + .../client/models/v1beta1_job_template_spec.pyi | 25 + .../client/models/v1beta1_json_schema_props.pyi | 190 +++++++ .../kubernetes/client/models/v1beta1_lease.pyi | 35 ++ .../client/models/v1beta1_lease_list.pyi | 35 ++ .../client/models/v1beta1_lease_spec.pyi | 40 ++ .../models/v1beta1_local_subject_access_review.pyi | 40 ++ .../v1beta1_mutating_webhook_configuration.pyi | 35 ++ ...v1beta1_mutating_webhook_configuration_list.pyi | 35 ++ .../client/models/v1beta1_network_policy.pyi | 35 ++ .../models/v1beta1_network_policy_egress_rule.pyi | 25 + .../models/v1beta1_network_policy_ingress_rule.pyi | 20 + .../client/models/v1beta1_network_policy_list.pyi | 35 ++ .../client/models/v1beta1_network_policy_peer.pyi | 30 + .../client/models/v1beta1_network_policy_port.pyi | 25 + .../client/models/v1beta1_network_policy_spec.pyi | 35 ++ .../models/v1beta1_non_resource_attributes.pyi | 25 + .../client/models/v1beta1_non_resource_rule.pyi | 25 + .../models/v1beta1_pod_disruption_budget.pyi | 40 ++ .../models/v1beta1_pod_disruption_budget_list.pyi | 35 ++ .../models/v1beta1_pod_disruption_budget_spec.pyi | 30 + .../v1beta1_pod_disruption_budget_status.pyi | 45 ++ .../client/models/v1beta1_policy_rule.pyi | 40 ++ .../client/models/v1beta1_priority_class.pyi | 45 ++ .../client/models/v1beta1_priority_class_list.pyi | 35 ++ .../client/models/v1beta1_replica_set.pyi | 40 ++ .../models/v1beta1_replica_set_condition.pyi | 40 ++ .../client/models/v1beta1_replica_set_list.pyi | 35 ++ .../client/models/v1beta1_replica_set_spec.pyi | 35 ++ .../client/models/v1beta1_replica_set_status.pyi | 45 ++ .../client/models/v1beta1_resource_attributes.pyi | 50 ++ .../client/models/v1beta1_resource_rule.pyi | 35 ++ .../kubernetes/client/models/v1beta1_role.pyi | 35 ++ .../client/models/v1beta1_role_binding.pyi | 40 ++ .../client/models/v1beta1_role_binding_list.pyi | 35 ++ .../kubernetes/client/models/v1beta1_role_list.pyi | 35 ++ .../kubernetes/client/models/v1beta1_role_ref.pyi | 30 + .../models/v1beta1_rolling_update_daemon_set.pyi | 20 + ...1beta1_rolling_update_stateful_set_strategy.pyi | 20 + .../client/models/v1beta1_rule_with_operations.pyi | 35 ++ .../models/v1beta1_self_subject_access_review.pyi | 40 ++ .../v1beta1_self_subject_access_review_spec.pyi | 25 + .../models/v1beta1_self_subject_rules_review.pyi | 40 ++ .../v1beta1_self_subject_rules_review_spec.pyi | 20 + .../client/models/v1beta1_stateful_set.pyi | 40 ++ .../models/v1beta1_stateful_set_condition.pyi | 40 ++ .../client/models/v1beta1_stateful_set_list.pyi | 35 ++ .../client/models/v1beta1_stateful_set_spec.pyi | 55 ++ .../client/models/v1beta1_stateful_set_status.pyi | 60 ++ .../v1beta1_stateful_set_update_strategy.pyi | 25 + .../client/models/v1beta1_storage_class.pyi | 65 +++ .../client/models/v1beta1_storage_class_list.pyi | 35 ++ .../kubernetes/client/models/v1beta1_subject.pyi | 35 ++ .../models/v1beta1_subject_access_review.pyi | 40 ++ .../models/v1beta1_subject_access_review_spec.pyi | 45 ++ .../v1beta1_subject_access_review_status.pyi | 35 ++ .../models/v1beta1_subject_rules_review_status.pyi | 35 ++ .../client/models/v1beta1_token_review.pyi | 40 ++ .../client/models/v1beta1_token_review_spec.pyi | 20 + .../client/models/v1beta1_token_review_status.pyi | 30 + .../kubernetes/client/models/v1beta1_user_info.pyi | 35 ++ .../v1beta1_validating_webhook_configuration.pyi | 35 ++ ...beta1_validating_webhook_configuration_list.pyi | 35 ++ .../client/models/v1beta1_volume_attachment.pyi | 40 ++ .../models/v1beta1_volume_attachment_list.pyi | 35 ++ .../models/v1beta1_volume_attachment_source.pyi | 20 + .../models/v1beta1_volume_attachment_spec.pyi | 30 + .../models/v1beta1_volume_attachment_status.pyi | 35 ++ .../client/models/v1beta1_volume_error.pyi | 25 + .../kubernetes/client/models/v1beta1_webhook.pyi | 45 ++ .../models/v1beta1_webhook_client_config.pyi | 30 + .../client/models/v1beta2_controller_revision.pyi | 40 ++ .../models/v1beta2_controller_revision_list.pyi | 35 ++ .../client/models/v1beta2_daemon_set.pyi | 40 ++ .../client/models/v1beta2_daemon_set_condition.pyi | 40 ++ .../client/models/v1beta2_daemon_set_list.pyi | 35 ++ .../client/models/v1beta2_daemon_set_spec.pyi | 40 ++ .../client/models/v1beta2_daemon_set_status.pyi | 65 +++ .../models/v1beta2_daemon_set_update_strategy.pyi | 25 + .../client/models/v1beta2_deployment.pyi | 40 ++ .../client/models/v1beta2_deployment_condition.pyi | 45 ++ .../client/models/v1beta2_deployment_list.pyi | 35 ++ .../client/models/v1beta2_deployment_spec.pyi | 55 ++ .../client/models/v1beta2_deployment_status.pyi | 55 ++ .../client/models/v1beta2_deployment_strategy.pyi | 25 + .../client/models/v1beta2_replica_set.pyi | 40 ++ .../models/v1beta2_replica_set_condition.pyi | 40 ++ .../client/models/v1beta2_replica_set_list.pyi | 35 ++ .../client/models/v1beta2_replica_set_spec.pyi | 35 ++ .../client/models/v1beta2_replica_set_status.pyi | 45 ++ .../models/v1beta2_rolling_update_daemon_set.pyi | 20 + .../models/v1beta2_rolling_update_deployment.pyi | 25 + ...1beta2_rolling_update_stateful_set_strategy.pyi | 20 + .../kubernetes/client/models/v1beta2_scale.pyi | 40 ++ .../client/models/v1beta2_scale_spec.pyi | 20 + .../client/models/v1beta2_scale_status.pyi | 30 + .../client/models/v1beta2_stateful_set.pyi | 40 ++ .../models/v1beta2_stateful_set_condition.pyi | 40 ++ .../client/models/v1beta2_stateful_set_list.pyi | 35 ++ .../client/models/v1beta2_stateful_set_spec.pyi | 55 ++ .../client/models/v1beta2_stateful_set_status.pyi | 60 ++ .../v1beta2_stateful_set_update_strategy.pyi | 25 + .../kubernetes/client/models/v2alpha1_cron_job.pyi | 40 ++ .../client/models/v2alpha1_cron_job_list.pyi | 35 ++ .../client/models/v2alpha1_cron_job_spec.pyi | 50 ++ .../client/models/v2alpha1_cron_job_status.pyi | 25 + .../client/models/v2alpha1_job_template_spec.pyi | 25 + .../v2beta1_cross_version_object_reference.pyi | 30 + .../models/v2beta1_external_metric_source.pyi | 35 ++ .../models/v2beta1_external_metric_status.pyi | 35 ++ .../models/v2beta1_horizontal_pod_autoscaler.pyi | 40 ++ ...v2beta1_horizontal_pod_autoscaler_condition.pyi | 40 ++ .../v2beta1_horizontal_pod_autoscaler_list.pyi | 35 ++ .../v2beta1_horizontal_pod_autoscaler_spec.pyi | 35 ++ .../v2beta1_horizontal_pod_autoscaler_status.pyi | 45 ++ .../client/models/v2beta1_metric_spec.pyi | 40 ++ .../client/models/v2beta1_metric_status.pyi | 40 ++ .../client/models/v2beta1_object_metric_source.pyi | 40 ++ .../client/models/v2beta1_object_metric_status.pyi | 40 ++ .../client/models/v2beta1_pods_metric_source.pyi | 30 + .../client/models/v2beta1_pods_metric_status.pyi | 30 + .../models/v2beta1_resource_metric_source.pyi | 30 + .../models/v2beta1_resource_metric_status.pyi | 30 + .../v2beta2_cross_version_object_reference.pyi | 30 + .../models/v2beta2_external_metric_source.pyi | 25 + .../models/v2beta2_external_metric_status.pyi | 25 + .../models/v2beta2_horizontal_pod_autoscaler.pyi | 40 ++ ...v2beta2_horizontal_pod_autoscaler_condition.pyi | 40 ++ .../v2beta2_horizontal_pod_autoscaler_list.pyi | 35 ++ .../v2beta2_horizontal_pod_autoscaler_spec.pyi | 35 ++ .../v2beta2_horizontal_pod_autoscaler_status.pyi | 45 ++ .../client/models/v2beta2_metric_identifier.pyi | 25 + .../client/models/v2beta2_metric_spec.pyi | 40 ++ .../client/models/v2beta2_metric_status.pyi | 40 ++ .../client/models/v2beta2_metric_target.pyi | 35 ++ .../client/models/v2beta2_metric_value_status.pyi | 30 + .../client/models/v2beta2_object_metric_source.pyi | 30 + .../client/models/v2beta2_object_metric_status.pyi | 30 + .../client/models/v2beta2_pods_metric_source.pyi | 25 + .../client/models/v2beta2_pods_metric_status.pyi | 25 + .../models/v2beta2_resource_metric_source.pyi | 25 + .../models/v2beta2_resource_metric_status.pyi | 25 + .../kubernetes/client/models/version_info.pyi | 60 ++ tests/static/typeshed/kubernetes/client/rest.pyi | 36 ++ .../static/typeshed/kubernetes/config/__init__.pyi | 7 + .../kubernetes/config/config_exception.pyi | 5 + .../static/typeshed/kubernetes/config/dateutil.pyi | 17 + .../typeshed/kubernetes/config/dateutil_test.pyi | 10 + .../typeshed/kubernetes/config/exec_provider.pyi | 13 + .../static/typeshed/kubernetes/stream/__init__.pyi | 5 + tests/static/typeshed/kubernetes/stream/stream.pyi | 7 + .../typeshed/kubernetes/stream/ws_client.pyi | 37 ++ .../typeshed/kubernetes/stream/ws_client_test.pyi | 9 + .../static/typeshed/kubernetes/utils/__init__.pyi | 5 + .../typeshed/kubernetes/utils/create_from_yaml.pyi | 7 + .../static/typeshed/kubernetes/watch/__init__.pyi | 5 + tests/static/typeshed/kubernetes/watch/watch.pyi | 21 + 655 files changed, 25256 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c673d83cfc…

5 years, 10 months

6687 FIX Fixed broken prefered button computation

by Andreas Boesl

Module: check_mk Branch: master Commit: 8adf95db58c43f08762e1a1716a595eb14671736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8adf95db58c43f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:44:48 2018 +0100 6687 FIX Fixed broken prefered button computation The computation of the prefered buttons within views did not work. Change-Id: Ia20705db845968dcf9f34b3f309e831e6dd4dbc1 --- .werks/6687 | 10 ++++++++++ cmk/gui/inventory.py | 8 ++++---- cmk/gui/views.py | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/6687 b/.werks/6687 new file mode 100644 index 0000000..dc9a4d2 --- /dev/null +++ b/.werks/6687 @@ -0,0 +1,10 @@ +Title: Fixed broken prefered button computation +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542624245 +Class: fix + +The computation of the prefered buttons within views did not work. diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index f1b1f35..9802c94 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -260,13 +260,13 @@ def _filter_tree(struct_tree): def _get_permitted_inventory_paths(): + """ + Returns either a list of permitted paths or + None in case the user is allowed to see the whole tree. + """ cache_varname = "permitted_inventory_paths" if html.is_cached(cache_varname): return html.get_cached(cache_varname) - """ -Returns either a list of permitted paths or -None in case the user is allowed to see the whole tree. -""" contact_groups = userdb.load_group_information().get("contact", {}) user_groups = userdb.contactgroups_of_user(config.user.id) if not user_groups: diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 1cbad9d..84885d2 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -1588,7 +1588,7 @@ def update_context_links(enable_command_toggle, enable_checkbox_toggle): @cmk.gui.pages.register("count_context_button") def ajax_count_button(): - id_ = html.var("id_") + id_ = html.var("id") counts = config.user.load_file("buttoncounts", {}) for i in counts: counts[i] *= 0.95

5 years, 10 months

Added omd/packages/{omd.bin, omdlib} to YAPF scope

by Lars Michelsen

Module: check_mk Branch: master Commit: e781f2246af5fd7d3379ef8a3afa58f8d7d0b292 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e781f2246af5fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 19 14:46:48 2018 +0100 Added omd/packages/{omd.bin,omdlib} to YAPF scope Change-Id: Ic60028c883c0654ed7314d3b6da9e3f8963180ad --- omd/packages/omd/omd.bin | 1 - omd/packages/omd/omdlib/__init__.py | 1 - omd/packages/omd/omdlib/main.py | 1448 ++++++++++++++++++----------------- tests/find-python-files | 3 +- 4 files changed, 730 insertions(+), 723 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e781f2246a…

5 years, 10 months

move centos skel workaround into apache skel target

by Alex Zurhake

Module: check_mk Branch: master Commit: b7102ef85cf24dbe90d89cd540aeac53720cef47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7102ef85cf24d… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 14:57:42 2018 +0100 move centos skel workaround into apache skel target Change-Id: I4b04e9213d6b80aec3d8a0d182b446167d5d4e89 --- omd/packages/apache-omd/apache-omd.make | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/omd/packages/apache-omd/apache-omd.make b/omd/packages/apache-omd/apache-omd.make index 1d2961f..20ce5e6 100644 --- a/omd/packages/apache-omd/apache-omd.make +++ b/omd/packages/apache-omd/apache-omd.make @@ -81,15 +81,17 @@ $(APACHE_INSTALL): $(LN) -sf $(HTPASSWD_BIN) $(DESTDIR)$(OMD_ROOT)/bin/htpasswd $(TOUCH) $@ + $(MKDIR) $(BUILD_HELPER_DIR) + $(TOUCH) $@ + +$(APACHE_SKEL): $(APACHE_INSTALL) # This file is loaded by php-wrapper on RedHat/CentOS < 7 if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \ + $(MKDIR) $(SKEL)/etc/apache/ cp /etc/php.ini $(SKEL)/etc/apache/php.ini; \ echo -e "\n\n; OMD OMD OMD OMD OMD OMD\n\nmemory_limit=64M\n\n[Session]\nsession.save_path=###ROOT###/tmp/php/session\nupload_tmp_dir=###ROOT###/tmp/php/upload\nsoap.wsdl_cache_dir=###ROOT###/tmp/php/wsdl-cache\n" >> $(SKEL)/etc/apache/php.ini; \ fi - $(MKDIR) $(BUILD_HELPER_DIR) - $(TOUCH) $@ - -$(APACHE_SKEL): $(APACHE_INSTALL) + # Create working directories $(MKDIR) $(SKEL)/var/log/apache $(MKDIR) $(SKEL)/var/www

5 years, 10 months

drop install dependecies to avoid rebuild in chroot

by Alex Zurhake

Module: check_mk Branch: master Commit: d8c0055491c5b82e43c6e2f4a26a7219a0726cd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8c0055491c5b8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 14:48:06 2018 +0100 drop install dependecies to avoid rebuild in chroot Change-Id: Ia2ff83579ab45153295e732912848da682519b60 --- omd/packages/openhardwaremonitor/openhardwaremonitor.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor.make b/omd/packages/openhardwaremonitor/openhardwaremonitor.make index 1c79270..fa787de 100644 --- a/omd/packages/openhardwaremonitor/openhardwaremonitor.make +++ b/omd/packages/openhardwaremonitor/openhardwaremonitor.make @@ -44,7 +44,9 @@ $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI: $(PACKAGE_DIR)/$(OPENHARDWARE $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitor.sln cp $< $(OPENHARDWAREMONITOR_DIR)/ -$(OPENHARDWAREMONITOR_INSTALL): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll +# Remove dependencies for now, to avoid triggering rebuild in chroots: +# $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll +$(OPENHARDWAREMONITOR_INSTALL): mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm install -m 755 $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm install -m 755 $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm

5 years, 10 months

use correct SKEL path

by Alex Zurhake

Module: check_mk Branch: master Commit: f7d351cf673b372f3704433e97adf611e8dba92e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7d351cf673b37… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 14:33:27 2018 +0100 use correct SKEL path Change-Id: I8127e78af6e406ec953a19a9ed3d365d0214e10e --- omd/packages/perl-modules/perl-modules.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/perl-modules/perl-modules.make b/omd/packages/perl-modules/perl-modules.make index bb18780..3304552 100644 --- a/omd/packages/perl-modules/perl-modules.make +++ b/omd/packages/perl-modules/perl-modules.make @@ -137,7 +137,7 @@ $(PERL_MODULES_INSTALL): $(PERL_MODULES_BUILD) $(TOUCH) $@ $(PERL_MODULES_SKEL): $(PERL_MODULES_INSTALL) - echo "install --install_base ###ROOT###/local/lib/perl5" > $(PERL_MODULES_SKEL)/.modulebuildrc + echo "install --install_base ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc $(TOUCH) $@ perl-modules-clean:

5 years, 10 months

Move regex validator PS check to plugins/wato/check_parameters.py

by Óscar Nájera

Module: check_mk Branch: master Commit: f998ae9bccd19823672f29002bbbf108ed2cacfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f998ae9bccd198… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 19 14:08:22 2018 +0100 Move regex validator PS check to plugins/wato/check_parameters.py Change-Id: Ib6b6b01e4ff0a04f38bc1506de8787aa12f8ff59 --- cmk/gui/plugins/wato/check_parameters.py | 18 ++++++++++++++++-- cmk/regex.py | 14 -------------- tests/unit/checks/test_ps.py | 13 ------------- .../unit/cmk/gui/plugins/wato/test_check_parameters.py | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 1699ab7..ff04da8 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -24,8 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import re import cmk.defines as defines -import cmk.regex as regex from cmk.gui.plugins.wato.active_checks import check_icmp_params @@ -1380,6 +1380,20 @@ def convert_inventory_processes(old_dict): return new_dict +def forbid_re_delimiters_inside_groups(pattern, varprefix): + # Used as input validation in PS check wato config + group_re = r'$.*?$' + for match in re.findall(group_re, pattern): + for char in ['\\b', '$', '^']: + if char in match: + raise MKUserError( + varprefix, + _('"%s" is not allowed inside the regular expression group %s. ' + 'Bounding characters inside groups will vanish after discovery, ' + 'because processes are instanced for every matching group. ' + 'Thus enforce delimiters outside the group.') % (char, match)) + + register_rule( group + '/' + subgroup_inventory, varname="inventory_processes_rules", @@ -1426,7 +1440,7 @@ register_rule( RegExp( size=50, mode=RegExp.prefix, - validate=regex.forbid_re_delimiters_inside_groups, + validate=forbid_re_delimiters_inside_groups, ), title=_("Regular expression matching command line"), label=_("Command line:"), diff --git a/cmk/regex.py b/cmk/regex.py index b24526a..83750c0 100644 --- a/cmk/regex.py +++ b/cmk/regex.py @@ -68,17 +68,3 @@ def escape_regex_chars(match): r += "\\" r += c return r - - -def forbid_re_delimiters_inside_groups(pattern, varprefix): - # Used as input validation in PS check wato config - group_re = r'$.*?$' - for match in re.findall(group_re, pattern): - for char in ['\\b', '$', '^']: - if char in match: - raise MKUserError( - varprefix, - _('"%s" is not allowed inside the regular expression group %s. ' - 'Bounding characters inside groups will vanish after discovery, ' - 'because processes are instanced for every matching group. ' - 'Thus enforce delimiters outside the group.') % (char, match)) diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 1916640..849325f 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -1,8 +1,6 @@ from collections import namedtuple import pytest from cmk_base.check_api import MKGeneralException -from cmk.gui.exceptions import MKUserError -from cmk.regex import forbid_re_delimiters_inside_groups from checktestlib import CheckResult, assertCheckResultsEqual pytestmark = pytest.mark.checks @@ -592,17 +590,6 @@ def test_check_ps_common_count(check_manager, levels, reference): assertCheckResultsEqual(output, reference) -(a)pytest.mark.parametrize('pattern', ["(test)$", 'foo\\b', '^bar', '\\bfoo\\b', '(a)\\b']) -def test_validate_ps_allowed_regex(pattern): - assert forbid_re_delimiters_inside_groups(pattern, '') is None - - -(a)pytest.mark.parametrize('pattern', ["(test$)", '(foo\\b)', '(^bar)', '(\\bfoo\\b)']) -def test_validate_ps_forbidden_regex(pattern): - with pytest.raises(MKUserError): - forbid_re_delimiters_inside_groups(pattern, '') - - def test_subset_patterns(check_manager): check = check_manager.get_check("ps") diff --git a/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py b/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py new file mode 100644 index 0000000..afe72e3 --- /dev/null +++ b/tests/unit/cmk/gui/plugins/wato/test_check_parameters.py @@ -0,0 +1,14 @@ +import pytest +from cmk.gui.exceptions import MKUserError +from cmk.gui.plugins.wato.check_parameters import forbid_re_delimiters_inside_groups + + +(a)pytest.mark.parametrize('pattern', ["(test)$", 'foo\\b', '^bar', '\\bfoo\\b', '(a)\\b']) +def test_validate_ps_allowed_regex(pattern): + assert forbid_re_delimiters_inside_groups(pattern, '') is None + + +(a)pytest.mark.parametrize('pattern', ["(test$)", '(foo\\b)', '(^bar)', '(\\bfoo\\b)']) +def test_validate_ps_forbidden_regex(pattern): + with pytest.raises(MKUserError): + forbid_re_delimiters_inside_groups(pattern, '')

5 years, 10 months

repair openhardwaremonitor install

by Alex Zurhake

Module: check_mk Branch: master Commit: 8763fad9c66b9f89f0f87957fbea95995f63fa5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8763fad9c66b9f… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 12:59:55 2018 +0100 repair openhardwaremonitor install Change-Id: I037d9e317004735828d7a847028a4e74db53ec79 --- omd/packages/openhardwaremonitor/openhardwaremonitor.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor.make b/omd/packages/openhardwaremonitor/openhardwaremonitor.make index 9242cbc..1c79270 100644 --- a/omd/packages/openhardwaremonitor/openhardwaremonitor.make +++ b/omd/packages/openhardwaremonitor/openhardwaremonitor.make @@ -44,10 +44,10 @@ $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI: $(PACKAGE_DIR)/$(OPENHARDWARE $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitor.sln cp $< $(OPENHARDWAREMONITOR_DIR)/ -$(OPENHARDWAREMONITOR_INSTALL): OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll +$(OPENHARDWAREMONITOR_INSTALL): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm - install -m 755 OpenHardwareMonitorCLI.exe $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm - install -m 755 OpenHardwareMonitorLib.dll $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm + install -m 755 $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm + install -m 755 $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll $(DESTDIR)$(OMD_ROOT)/share/check_mk/agents/windows/ohm $(OPENHARDWAREMONITOR)-skel:

5 years, 10 months

Fixed nagvis auth hook after activating changes

by Lars Michelsen

Module: check_mk Branch: master Commit: ede1f2182248917a7a252ae80f8bf5d909e20204 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ede1f218224891… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 17 13:43:04 2018 +0100 Fixed nagvis auth hook after activating changes Change-Id: I5e730b243391c8dbe0af781856e04c83c52d85a4 --- cmk/gui/plugins/userdb/hook_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/userdb/hook_auth.py b/cmk/gui/plugins/userdb/hook_auth.py index b0fd3bb..76daffb 100644 --- a/cmk/gui/plugins/userdb/hook_auth.py +++ b/cmk/gui/plugins/userdb/hook_auth.py @@ -226,7 +226,7 @@ function permitted_maps($username) { def create_auth_file(callee, users=None): import cmk.gui.userdb as userdb # TODO: Cleanup if users is None: - userdb.load_users() + users = userdb.load_users() store.mkdir(g_auth_base_dir)

5 years, 10 months

reduced number of store.load_* operations

by Andreas Boesl

Module: check_mk Branch: master Commit: 969b794c4508284c6b758abd6071405baaf2470a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=969b794c450828… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 15 18:19:09 2018 +0100 reduced number of store.load_* operations CMK-1271 Change-Id: I15d56f01b31a449584f4b55a0857046377d99195 --- cmk/gui/config.py | 6 ++++++ cmk/gui/htmllib.py | 2 +- cmk/gui/inventory.py | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index b17b466..446feb1 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -443,6 +443,7 @@ class LoggedInUser(object): self._load_attributes() self._load_permissions() self._load_site_config() + self._button_counts = None # TODO: Clean up that baserole_* stuff? def _load_roles(self): @@ -511,6 +512,11 @@ class LoggedInUser(object): def _load_site_config(self): self.siteconf = self.load_file("siteconfig", {}) + def get_button_counts(self): + if not self._button_counts: + self._button_counts = self.load_file("buttoncounts", {}) + return self._button_counts + def save_site_config(self): self.save_file("siteconfig", self.siteconf) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 57c8180..fbf1ef7 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -2119,7 +2119,7 @@ class html(HTMLGenerator): self.close_div() def get_button_counts(self): - return config.user.load_file("buttoncounts", {}) + return config.user.get_button_counts() def empty_icon_button(self): self.write(self.render_icon("images/trans.png", cssclass="iconbutton trans")) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index ab78677..f1b1f35 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -260,6 +260,9 @@ def _filter_tree(struct_tree): def _get_permitted_inventory_paths(): + cache_varname = "permitted_inventory_paths" + if html.is_cached(cache_varname): + return html.get_cached(cache_varname) """ Returns either a list of permitted paths or None in case the user is allowed to see the whole tree. @@ -267,6 +270,7 @@ None in case the user is allowed to see the whole tree. contact_groups = userdb.load_group_information().get("contact", {}) user_groups = userdb.contactgroups_of_user(config.user.id) if not user_groups: + html.set_cache(cache_varname, None) return None forbid_whole_tree = False @@ -275,9 +279,11 @@ None in case the user is allowed to see the whole tree. inventory_paths = contact_groups.get(user_group, {}).get('inventory_paths') if inventory_paths is None: # Old configuration: no paths configured means 'allow_all' + html.set_cache(cache_varname, None) return None if inventory_paths == "allow_all": + html.set_cache(cache_varname, None) return None elif inventory_paths == "forbid_all": @@ -294,7 +300,10 @@ None in case the user is allowed to see the whole tree. permitted_paths.append((parsed, entry.get("attributes"))) if forbid_whole_tree and not permitted_paths: + html.set_cache(cache_varname, []) return [] + + html.set_cache(cache_varname, permitted_paths) return permitted_paths

5 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018