Skip to content

Commit

Permalink
Update to ES 7.10.0 and update a couple nuget packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ejsmith committed Nov 12, 2020
1 parent 7eb75c3 commit cc472b1
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ CMD [ "dotnet", "Exceptionless.Web.dll" ]

# completely self-contained

FROM exceptionless/elasticsearch:7.9.3 AS exceptionless
FROM exceptionless/elasticsearch:7.10.0 AS exceptionless

WORKDIR /app
COPY --from=api-publish /app/src/Exceptionless.Web/out ./
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
- appdata:/app/storage

elasticsearch:
image: exceptionless/elasticsearch:7.9.3
image: exceptionless/elasticsearch:7.10.0
environment:
discovery.type: single-node
xpack.security.enabled: 'false'
Expand All @@ -66,7 +66,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:7.9.3
image: docker.elastic.co/kibana/kibana:7.10.0
ports:
- 5601:5601

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3.5'

services:
elasticsearch:
image: exceptionless/elasticsearch:7.9.3
image: exceptionless/elasticsearch:7.10.0
environment:
discovery.type: single-node
xpack.security.enabled: 'false'
Expand All @@ -17,7 +17,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:7.9.3
image: docker.elastic.co/kibana/kibana:7.10.0
ports:
- 5601:5601

Expand Down
124 changes: 124 additions & 0 deletions k8s/container-azm-ms-agentconfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
kind: ConfigMap
apiVersion: v1
data:
schema-version:
#string.used by agent to parse config. supported versions are {v1}. Configs with other schema versions will be rejected by the agent.
v1
config-version:
#string.used by customer to keep track of this config file's version in their source control/repository (max allowed 10 chars, other chars will be truncated)
ver1
log-data-collection-settings: |-
# Log data collection settings
# Any errors related to config map settings can be found in the KubeMonAgentEvents table in the Log Analytics workspace that the cluster is sending data to.
[log_collection_settings]
[log_collection_settings.stdout]
# In the absense of this configmap, default value for enabled is true
enabled = true
# exclude_namespaces setting holds good only if enabled is set to true
# kube-system log collection is disabled by default in the absence of 'log_collection_settings.stdout' setting. If you want to enable kube-system, remove it from the following setting.
# If you want to continue to disable kube-system log collection keep this namespace in the following setting and add any other namespace you want to disable log collection to the array.
# In the absense of this configmap, default value for exclude_namespaces = ["kube-system"]
exclude_namespaces = ["kube-system","ingress-nginx"]
[log_collection_settings.stderr]
# Default value for enabled is true
enabled = true
# exclude_namespaces setting holds good only if enabled is set to true
# kube-system log collection is disabled by default in the absence of 'log_collection_settings.stderr' setting. If you want to enable kube-system, remove it from the following setting.
# If you want to continue to disable kube-system log collection keep this namespace in the following setting and add any other namespace you want to disable log collection to the array.
# In the absense of this cofigmap, default value for exclude_namespaces = ["kube-system"]
exclude_namespaces = ["kube-system"]
[log_collection_settings.env_var]
# In the absense of this configmap, default value for enabled is true
enabled = true
[log_collection_settings.enrich_container_logs]
# In the absense of this configmap, default value for enrich_container_logs is false
enabled = false
# When this is enabled (enabled = true), every container log entry (both stdout & stderr) will be enriched with container Name & container Image
[log_collection_settings.collect_all_kube_events]
# In the absense of this configmap, default value for collect_all_kube_events is false
# When the setting is set to false, only the kube events with !normal event type will be collected
enabled = false
# When this is enabled (enabled = true), all kube events including normal events will be collected
prometheus-data-collection-settings: |-
# Custom Prometheus metrics data collection settings
[prometheus_data_collection_settings.cluster]
# Cluster level scrape endpoint(s). These metrics will be scraped from agent's Replicaset (singleton)
# Any errors related to prometheus scraping can be found in the KubeMonAgentEvents table in the Log Analytics workspace that the cluster is sending data to.
#Interval specifying how often to scrape for metrics. This is duration of time and can be specified for supporting settings by combining an integer value and time unit as a string value. Valid time units are ns, us (or µs), ms, s, m, h.
interval = "1m"
## Uncomment the following settings with valid string arrays for prometheus scraping
#fieldpass = ["metric_to_pass1", "metric_to_pass12"]
#fielddrop = ["metric_to_drop"]
# An array of urls to scrape metrics from.
# urls = ["http://myurl:9101/metrics"]
# An array of Kubernetes services to scrape metrics from.
# kubernetes_services = ["http://my-service-dns.my-namespace:9102/metrics"]
# When monitor_kubernetes_pods = true, replicaset will scrape Kubernetes pods for the following prometheus annotations:
# - prometheus.io/scrape: Enable scraping for this pod
# - prometheus.io/scheme: If the metrics endpoint is secured then you will need to
# set this to `https` & most likely set the tls config.
# - prometheus.io/path: If the metrics path is not /metrics, define it with this annotation.
# - prometheus.io/port: If port is not 9102 use this annotation
monitor_kubernetes_pods = false
## Restricts Kubernetes monitoring to namespaces for pods that have annotations set and are scraped using the monitor_kubernetes_pods setting.
## This will take effect when monitor_kubernetes_pods is set to true
## ex: monitor_kubernetes_pods_namespaces = ["default1", "default2", "default3"]
# monitor_kubernetes_pods_namespaces = ["default1"]
[prometheus_data_collection_settings.node]
# Node level scrape endpoint(s). These metrics will be scraped from agent's DaemonSet running in every node in the cluster
# Any errors related to prometheus scraping can be found in the KubeMonAgentEvents table in the Log Analytics workspace that the cluster is sending data to.
#Interval specifying how often to scrape for metrics. This is duration of time and can be specified for supporting settings by combining an integer value and time unit as a string value. Valid time units are ns, us (or µs), ms, s, m, h.
interval = "1m"
## Uncomment the following settings with valid string arrays for prometheus scraping
# An array of urls to scrape metrics from. $NODE_IP (all upper case) will substitute of running Node's IP address
# urls = ["http://$NODE_IP:9103/metrics"]
#fieldpass = ["metric_to_pass1", "metric_to_pass12"]
#fielddrop = ["metric_to_drop"]
metric_collection_settings: |-
# Metrics collection settings for metrics sent to Log Analytics and MDM
[metric_collection_settings.collect_kube_system_pv_metrics]
# In the absense of this configmap, default value for collect_kube_system_pv_metrics is false
# When the setting is set to false, only the persistent volume metrics outside the kube-system namespace will be collected
enabled = false
# When this is enabled (enabled = true), persistent volume metrics including those in the kube-system namespace will be collected
alertable-metrics-configuration-settings: |-
# Alertable metrics configuration settings for container resource utilization
[alertable_metrics_configuration_settings.container_resource_utilization_thresholds]
# The threshold(Type Float) will be rounded off to 2 decimal points
# Threshold for container cpu, metric will be sent only when cpu utilization exceeds or becomes equal to the following percentage
container_cpu_threshold_percentage = 95.0
# Threshold for container memoryRss, metric will be sent only when memory rss exceeds or becomes equal to the following percentage
container_memory_rss_threshold_percentage = 95.0
# Threshold for container memoryWorkingSet, metric will be sent only when memory working set exceeds or becomes equal to the following percentage
container_memory_working_set_threshold_percentage = 95.0
# Alertable metrics configuration settings for persistent volume utilization
[alertable_metrics_configuration_settings.pv_utilization_thresholds]
# Threshold for persistent volume usage bytes, metric will be sent only when persistent volume utilization exceeds or becomes equal to the following percentage
pv_usage_threshold_percentage = 60.0
integrations: |-
[integrations.azure_network_policy_manager]
collect_basic_metrics = false
collect_advanced_metrics = false
metadata:
name: container-azm-ms-agentconfig
namespace: kube-system
6 changes: 3 additions & 3 deletions k8s/ex-dev-elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: ex-dev
namespace: ex-dev
spec:
version: 7.9.1
image: exceptionless/elasticsearch:7.9.1 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
version: 7.10.0
image: exceptionless/elasticsearch:7.10.0 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
secureSettings:
- secretName: ex-dev-snapshots
http:
Expand Down Expand Up @@ -58,7 +58,7 @@ metadata:
name: ex-dev
namespace: ex-dev
spec:
version: 7.9.1
version: 7.10.0
count: 1
elasticsearchRef:
name: ex-dev
Expand Down
6 changes: 3 additions & 3 deletions k8s/ex-prod-elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: ex-prod
namespace: ex-prod
spec:
version: 7.9.1
image: exceptionless/elasticsearch:7.9.1 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
version: 7.10.0
image: exceptionless/elasticsearch:7.10.0 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
secureSettings:
- secretName: ex-prod-snapshots
http:
Expand Down Expand Up @@ -59,7 +59,7 @@ metadata:
name: ex-prod
namespace: ex-prod
spec:
version: 7.9.1
version: 7.10.0
count: 1
elasticsearchRef:
name: ex-prod
Expand Down
4 changes: 2 additions & 2 deletions samples/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- appdata:/app/storage

elasticsearch:
image: exceptionless/elasticsearch:7.9.3
image: exceptionless/elasticsearch:7.10.0
environment:
discovery.type: single-node
xpack.security.enabled: 'false'
Expand All @@ -59,7 +59,7 @@ services:
kibana:
depends_on:
- elasticsearch
image: docker.elastic.co/kibana/kibana:7.9.3
image: docker.elastic.co/kibana/kibana:7.10.0
ports:
- 5601:5601

Expand Down
8 changes: 4 additions & 4 deletions src/Exceptionless.Core/Exceptionless.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\build\common.props" />
<ItemGroup>
<None Remove="Mail\Templates\event-notice.html" />
Expand All @@ -23,7 +23,7 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="10.1.1" />
<PackageReference Include="AutoMapper.Collection" Version="7.0.0" />
<PackageReference Include="FluentValidation" Version="9.2.2" />
<PackageReference Include="FluentValidation" Version="9.3.0" />
<PackageReference Include="Foundatio.Extensions.Hosting" Version="10.0.1" />
<PackageReference Include="Foundatio.JsonNet" Version="10.0.1" />
<PackageReference Include="NEST.JsonNetSerializer" Version="7.9.0" />
Expand All @@ -32,8 +32,8 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Stripe.net" Version="39.22.0" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0" />
<PackageReference Include="Stripe.net" Version="39.23.0" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0" />
<PackageReference Include="UAParser" Version="3.1.44" />

<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.9.3" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PackageReference Include="App.Metrics.Reporting.Graphite" Version="4.1.0" />
<PackageReference Include="App.Metrics.Reporting.Http" Version="4.1.0" />
<PackageReference Include="App.Metrics.Reporting.InfluxDB" Version="4.1.0" />
<PackageReference Include="StackExchange.Redis" Version="2.1.117" />
<PackageReference Include="StackExchange.Redis" Version="2.1.139" />
<PackageReference Include="Geocoding.Google" Version="4.0.1" />
<PackageReference Include="MaxMind.GeoIP2" Version="3.3.0" />
<PackageReference Include="Foundatio.Aliyun" Version="10.0.0" />
Expand Down

0 comments on commit cc472b1

Please sign in to comment.