Skip to content

Commit b5a302a

Browse files
gerlowskijagerlowskija
authored
Merge pull request #32 from lucidworks/LWSHADOOP-757-wip
LWSHADOOP-757: Create 7.3.1 SOLR service
2 parents dd3074d + 09e77c9 commit b5a302a

31 files changed

+3830
-2
lines changed

‎build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ext.mpack = 'mpack.json'
1616
ext.repostemplate = 'src/main/template/repos/repoinfo.xml'
1717
ext.reposinfo555 = 'custom-services/SOLR/5.5.5/repos/'
1818
ext.reposinfo662 = 'custom-services/SOLR/6.6.2/repos/'
19+
ext.reposinfo731 = 'custom-services/SOLR/7.3.1/repos/'
1920

2021
distributions {
2122
main {
@@ -41,6 +42,12 @@ distributions {
4142
line.replace("{REPOID}", "${repoid662}")
4243
}
4344
}
45+
into(reposinfo731) {
46+
from { repostemplate }
47+
filter { line ->
48+
line.replace("{REPOID}", "${repoid731}")
49+
}
50+
}
4451
}
4552
}
4653
}

‎gradle.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ repoid555=HDP-SOLR-2.6-100
66

77
# Solr 6.6.2 repo
88
# TODO a Solr repo is needed
9-
repoid662=HDP-SOLR-2.6-100
9+
repoid662=HDP-SOLR-3.0.0-100
10+
11+
# Solr 7.3.1 repo
12+
# TODO a Solr repo is needed
13+
repoid731=HDP-SOLR-3.0.0-100

‎src/main/mpack/common-services/SOLR/7.3.1/alerts.json‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
{
2+
"SOLR": {
3+
"SOLR_SERVER": [
4+
{
5+
"name": "solr",
6+
"label": "Solr Web UI",
7+
"description": "This host-level alert is triggered if the Solr Cloud Instance is unreachable.",
8+
"interval": 1,
9+
"scope": "ANY",
10+
"source": {
11+
"type": "WEB",
12+
"uri": {
13+
"http": "{{solr-config-env/solr_config_port}}",
14+
"https": "{{solr-config-env/solr_config_port}}",
15+
"https_property": "{{solr-ssl/solr_ssl_enable}}",
16+
"https_property_value": "true",
17+
"kerberos_keytab": "{{solr-config-env/solr_spnego_keytab_path}}",
18+
"kerberos_principal": "{{solr-config-env/solr_spnego_principal_name}}",
19+
"connection_timeout": 5.0,
20+
"default_port": 8983
21+
},
22+
"reporting": {
23+
"ok": {
24+
"text": "HTTP {0} response in {2:.3f}s"
25+
},
26+
"warning": {
27+
"text": "HTTP {0} response from {1} in {2:.3f}s ({3})"
28+
},
29+
"critical": {
30+
"text": "Connection failed to {1} ({3})"
31+
}
32+
}
33+
}
34+
},
35+
{
36+
"name": "solr_cpu_usage",
37+
"label": "Solr CPU Utilization",
38+
"description": "This host-level alert is triggered if CPU utilization of the Solr exceeds certain warning and critical thresholds. It checks the Solr JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
39+
"interval": 5,
40+
"scope": "ANY",
41+
"source": {
42+
"type": "SCRIPT",
43+
"path": "SOLR/7.3.1/package/alerts/alert_solr_cpu_metrics.py",
44+
"parameters": [
45+
{
46+
"name": "connection.timeout",
47+
"value": 5.0,
48+
"type": "NUMERIC",
49+
"units": "seconds",
50+
"visibility": "HIDDEN"
51+
},
52+
{
53+
"name": "app.id",
54+
"value": "solr-host-app",
55+
"type": "STRING",
56+
"visibility": "HIDDEN"
57+
},
58+
{
59+
"name": "metric.names",
60+
"value": "solr.jvm.gauge.os.processCpuLoad",
61+
"type": "STRING",
62+
"visibility": "HIDDEN"
63+
},
64+
{
65+
"name": "metric.solr.cpu.warning.threshold",
66+
"display_name": "Warning threshold",
67+
"type": "PERCENT",
68+
"units": "%",
69+
"value": 75,
70+
"description": "CPU usage is greater than 50%",
71+
"threshold": "WARNING"
72+
},
73+
{
74+
"name": "metric.solr.cpu.critical.threshold",
75+
"display_name": "Critical threshold",
76+
"type": "PERCENT",
77+
"units": "%",
78+
"value": 90,
79+
"description": "CPU usage is greater than 75%",
80+
"threshold": "CRITICAL"
81+
}
82+
]
83+
}
84+
},
85+
{
86+
"name": "solr_memory",
87+
"label": "Solr Memory Utilization",
88+
"description": "This host-level alert is triggered if CPU utilization of the Solr exceeds certain warning and critical thresholds. It checks the Solr JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
89+
"interval": 5,
90+
"scope": "ANY",
91+
"source": {
92+
"type": "SCRIPT",
93+
"path": "SOLR/7.3.1/package/alerts/alert_solr_memory_metrics.py",
94+
"parameters": [
95+
{
96+
"name": "connection.timeout",
97+
"value": 5.0,
98+
"type": "NUMERIC",
99+
"units": "seconds",
100+
"visibility": "HIDDEN"
101+
},
102+
{
103+
"name": "app.id",
104+
"value": "solr-host-app",
105+
"type": "STRING",
106+
"visibility": "HIDDEN"
107+
},
108+
{
109+
"name": "metric.names",
110+
"value": "solr.jvm.gauge.memory.total.used,solr.jvm.gauge.memory.total.max",
111+
"type": "STRING",
112+
"visibility": "HIDDEN"
113+
},
114+
{
115+
"name": "metric.solr.memory.warning.threshold",
116+
"display_name": "Warning threshold",
117+
"type": "PERCENT",
118+
"units": "%",
119+
"value": 75,
120+
"description": "Memory usage is greater than 50%",
121+
"threshold": "WARNING"
122+
},
123+
{
124+
"name": "metric.solr.memory.critical.threshold",
125+
"display_name": "Critical threshold",
126+
"type": "PERCENT",
127+
"units": "%",
128+
"value": 90,
129+
"description": "Memory usage is greater than 75%",
130+
"threshold": "CRITICAL"
131+
}
132+
]
133+
}
134+
}
135+
]
136+
}
137+
}

‎src/main/mpack/common-services/SOLR/7.3.1/configuration/example-collection.xml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0"?>
2+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3+
4+
<configuration supports_final="false" supports_adding_forbidden="true">
5+
<property>
6+
<name>solr_collection_sample_create</name>
7+
<value>true</value>
8+
<description>True to create a sample collection when Solr is deployed</description>
9+
<display-name>Create sample collection</display-name>
10+
<value-attributes>
11+
<type>boolean</type>
12+
<overridable>false</overridable>
13+
</value-attributes>
14+
</property>
15+
16+
<property>
17+
<name>solr_collection_sample_name</name>
18+
<value>collection1</value>
19+
<description>Solr sample collection name. Mandatory</description>
20+
<display-name>Sample collection name</display-name>
21+
</property>
22+
23+
<property>
24+
<name>solr_collection_sample_config_directory</name>
25+
<value>_default</value>
26+
<description>Solr sample collection configurations directory. Mandatory
27+
This directory path is relative to /opt/lucidworks-hadoop/solr/server/solr/configsets.
28+
It must contain at least solrconfig.xml and schema.xml
29+
</description>
30+
<display-name>Solr configuration directory</display-name>
31+
</property>
32+
33+
<property>
34+
<name>solr_collection_sample_shards</name>
35+
<value>2</value>
36+
<description>Number of Solr shards, for details refer to
37+
(https://cwiki.apache.org/confluence/display/solr/Shards+and+Indexing+Data+in+SolrCloud)
38+
</description>
39+
<value-attributes>
40+
<type>int</type>
41+
</value-attributes>
42+
<display-name>Number of shards</display-name>
43+
</property>
44+
45+
<property>
46+
<name>solr_collection_sample_replicas</name>
47+
<value>1</value>
48+
<description>Number of Solr replicas, for details refer to
49+
(https://cwiki.apache.org/confluence/display/solr/NRT%2C+Replication%2C+and+Disaster+Recovery+with+SolrCloud)
50+
</description>
51+
<value-attributes>
52+
<type>int</type>
53+
</value-attributes>
54+
<display-name>Number of replicas</display-name>
55+
</property>
56+
</configuration>

0 commit comments

Comments
 (0)