ben.carrasco/jambonz-infrastructure
1
0
Fork 0
mirror of https://github.com/jambonz/jambonz-infrastructure.git synced 2026-07-24 22:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

more fixes from testing arm64 cluster

Browse Source
This commit is contained in:
Dave Horton
2022-11-02 16:17:39 -04:00
parent 5a9caf7a00
commit 74ae28ca3b
14 changed files with 3854 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloudformation/jambonz-scalable-production-arm64.yaml
+28 -13
View File
@@ -4,11 +4,11 @@ AWSTemplateFormatVersion: "2010-09-09"
Mappings:
AWSRegion2AMI:
us-west-2:
SbcSipAmi: ami-0b3c491b912e285a8
SbcRtpAmi: ami-0cc52a925157737b5
FsAmi: ami-01cb71bf0b624bb75
WebserverAmi: ami-06cd8ec798c6264eb
MonitoringServerAmi: ami-00712f4c846e57045
SbcSipAmi: ami-0f00e10205cd87d2b
SbcRtpAmi: ami-0c7f63b2b2a4c706a
FsAmi: ami-066e962a323f09933
WebserverAmi: ami-03d4ac2a96f891cd0
MonitoringServerAmi: ami-06c91848cd4a787a9
Parameters:
KeyName:
@@ -219,7 +219,14 @@ Parameters:
StatsSampleRate:
Type: Number
Description: sampling rate for metrics, a number between 0 and 1 inclusive
Default: 1
Default: 1.0
MinValue: 0.0
MaxValue: 1.0
MysqlDataCachingTtl:
Type: Number
Description: number of seconds to cache mysql query results locally (0=no caching)
Default: 0
MinValue: 0
EnableTracing:
Type: Number
Description: enable opentelemetry application tracing?
@@ -796,7 +803,7 @@ Resources:
Action: ['sts:AssumeRole']
ManagedPolicyArns:
- arn:aws:iam::aws:policy/AmazonSNSFullAccess
- arn:aws:iam::aws:policy/AutoScalingReadOnlyAccess
- arn:aws:iam::aws:policy/AutoScalingFullAccess
- arn:aws:iam::aws:policy/AmazonEC2FullAccess
# --- SIP server EC2 Role Instance profile
@@ -856,6 +863,7 @@ Resources:
JAMBONES_LOGLEVEL: 'info',
JAMBONES_CLUSTER_ID: '${JAMBONES_CLUSTER_ID}',
AVOID_UDH: true,
JAMBONES_MYSQL_REFRESH_TTL: ${JAMBONES_MYSQL_REFRESH_TTL},
JAMBONES_MYSQL_HOST: '${JAMBONES_MYSQL_HOST}',
JAMBONES_MYSQL_USER: '${JAMBONES_MYSQL_USER}',
JAMBONES_MYSQL_PASSWORD: '${JAMBONES_MYSQL_PASSWORD}',
@@ -880,6 +888,7 @@ Resources:
max_memory_restart: '1G',
env: {
NODE_ENV: 'production',
JAMBONES_MYSQL_REFRESH_TTL: ${JAMBONES_MYSQL_REFRESH_TTL},
JAMBONES_CLUSTER_ID: '${JAMBONES_CLUSTER_ID}',
JAMBONES_LOGLEVEL: 'info',
DRACHTIO_HOST: '127.0.0.1',
@@ -944,7 +953,7 @@ Resources:
max_memory_restart: '1G',
env: {
NODE_ENV: 'production',
JAMBONES_MYSQL_REFRESH_TTL: 30,
JAMBONES_MYSQL_REFRESH_TTL: ${JAMBONES_MYSQL_REFRESH_TTL},
JAMBONES_LOGLEVEL: 'info',
JAMBONES_NETWORK_CIDR: '${VPC_CIDR}',
MIN_CALL_LIMIT: 9999,
@@ -983,7 +992,7 @@ Resources:
max_memory_restart: '1G',
env: {
NODE_ENV: 'production',
JAMBONES_MYSQL_REFRESH_TTL: 30,
JAMBONES_MYSQL_REFRESH_TTL: ${JAMBONES_MYSQL_REFRESH_TTL},
JAMBONES_NETWORK_CIDR: '${VPC_CIDR}',
JAMBONES_LOGLEVEL: 'info',
AWS_REGION: '${AWS_REGION}',
@@ -1046,6 +1055,7 @@ Resources:
MONITORING_SERVER_IP: !GetAtt MonitoringServerEC2.PrivateIp
AWS_SNS_TOPIC_ARN: !Ref SbcSipServerSNSTopic
JAMBONES_TIME_SERIES_HOST: !GetAtt MonitoringServerEC2.PrivateIp
JAMBONES_MYSQL_REFRESH_TTL: !Ref MysqlDataCachingTtl
SbcSipServerPlacementGroup:
Type: AWS::EC2::PlacementGroup
Properties:
@@ -1123,7 +1133,7 @@ Resources:
Action: ['sts:AssumeRole']
ManagedPolicyArns:
- arn:aws:iam::aws:policy/AmazonSNSFullAccess
- arn:aws:iam::aws:policy/AutoScalingReadOnlyAccess
- arn:aws:iam::aws:policy/AutoScalingFullAccess
# --- Feature server EC2 Role Instance profile
FeatureServerInstanceProfile:
@@ -1172,7 +1182,7 @@ Resources:
max_memory_restart: '1G',
env: {
NODE_ENV: 'production',
JAMBONES_MYSQL_REFRESH_TTL: 30,
JAMBONES_MYSQL_REFRESH_TTL: ${JAMBONES_MYSQL_REFRESH_TTL},
ENABLE_METRICS: 1,
STATS_HOST: '127.0.0.1',
STATS_PORT: 8125,
@@ -1234,6 +1244,7 @@ Resources:
MONITORING_SERVER_IP: !GetAtt MonitoringServerEC2.PrivateIp
JAMBONES_TIME_SERIES_HOST: !GetAtt MonitoringServerEC2.PrivateIp
JWT_SECRET: !Ref EncryptionSecret
JAMBONES_MYSQL_REFRESH_TTL: !Ref MysqlDataCachingTtl
FeatureServerPlacementGroup:
Type: AWS::EC2::PlacementGroup
@@ -1308,7 +1319,7 @@ Resources:
Action: ['sts:AssumeRole']
ManagedPolicyArns:
- arn:aws:iam::aws:policy/AmazonSNSFullAccess
- arn:aws:iam::aws:policy/AutoScalingReadOnlyAccess
- arn:aws:iam::aws:policy/AutoScalingFullAccess
# --- Feature server EC2 Role Instance profile
SbcRTPServerInstanceProfile:
@@ -1483,7 +1494,7 @@ Resources:
Action: ['sts:AssumeRole']
ManagedPolicyArns:
- arn:aws:iam::aws:policy/AmazonEC2FullAccess
- arn:aws:iam::aws:policy/AutoScalingReadOnlyAccess
- arn:aws:iam::aws:policy/AutoScalingFullAccess
# --- Webserver EC2 Role Instance profile
WebServerInstanceProfile:
@@ -1611,6 +1622,10 @@ Resources:
EOF
echo "finished writing config file"
echo "building jambonz-api-server"
sudo -u admin bash -c "cd /home/admin/apps/jambonz-api-server && npm ci"
echo "finish building jambonz-api-server"
sudo -u admin bash -c "pm2 start /home/admin/apps/ecosystem.config.js"
sudo env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u admin --hp /home/admin
packer/jambonz-feature-server/README.md
-1
View File
@@ -15,7 +15,6 @@ To build an arm64 image:
```
$ packer build -color=false \
--var="ami_base_image_arch=arm64" \
--var="ami_base_image_owner=903794441882" \
--var="instance_type=t4g.xlarge" \
template.json
```
packer/jambonz-feature-server/files/switch.conf.xml
+2 -2
View File
@@ -58,9 +58,9 @@
this will ensure you're able to use the entire DS3 without a problem. Otherwise you'll
be 144 channels short of always filling that DS3 up which can translate into waste.
-->
<param name="max-sessions" value="1000"/>
<param name="max-sessions" value="2000"/>
<!--Most channels to create per second -->
<param name="sessions-per-second" value="50"/>
<param name="sessions-per-second" value="100"/>
<!-- Default Global Log Level - value is one of debug,info,notice,warning,err,crit,alert -->
<param name="loglevel" value="notice"/>
packer/jambonz-feature-server/template.json
+1 -1
View File
@@ -5,7 +5,7 @@
"ami_description": "jambonz feature server",
"instance_type": "t3.xlarge",
"drachtio_version": "v0.8.18",
"jambonz_version": "v0.7.7-10",
"jambonz_version": "v0.7.7-11",
"ami_base_image_arch": "amd64",
"ami_base_image_owner": "136693071363",
"install_telegraf": "yes",
packer/jambonz-mini/template.json
+1 -1
View File
@@ -5,7 +5,7 @@
"ami_description": "jambonz all-in-one AMI",
"instance_type": "t2.xlarge",
"drachtio_version": "v0.8.18",
"jambonz_version": "v0.7.7-9",
"jambonz_version": "v0.7.7-11",
"jambonz_user": "admin",
"jambonz_password": "JambonzR0ck$",
"install_telegraf": "yes",
packer/jambonz-monitoring/files/grafana-dashboard-jambonz-cluster.json
+3816
View File
File diff suppressed because it is too large Load Diff
packer/jambonz-monitoring/scripts/install_grafana.sh
+1 -1
View File
@@ -10,7 +10,7 @@ sudo mv /tmp/grafana-dashboard-default.yaml /etc/grafana/provisioning/dashboards
sudo mv /tmp/grafana-datasource.yml /etc/grafana/provisioning/datasources/datasource.yml
sudo mv /tmp/grafana-dashboard-heplify.json /var/lib/grafana/dashboards
sudo mv /tmp/grafana-dashboard-jambonz.json /var/lib/grafana/dashboards
sudo mv /tmp/grafana-dashboard-jambonz-cluster.json /var/lib/grafana/dashboards/grafana-dashboard-jambonz.json
sudo mv /tmp/grafana-dashboard-servers.json /var/lib/grafana/dashboards
sudo chown -R grafana:grafana /var/lib/grafana/dashboards
packer/jambonz-monitoring/template.json
+1 -1
View File
@@ -4,7 +4,7 @@
"ssh_username": "admin",
"ami_description": "jambonz monitoring server",
"instance_type": "t2.xlarge",
"jambonz_version": "v0.7.7-10",
"jambonz_version": "v0.7.7-11",
"homer_user": "homer_user",
"homer_password": "XcapJTqy11LnsYRtxXGPTYQkAnI",
"install_influxdb": "yes",
packer/jambonz-sbc-rtp/README.md
-1
View File
@@ -15,7 +15,6 @@ To build an arm64 image:
```
$ packer build -color=false \
--var="ami_base_image_arch=arm64" \
--var="ami_base_image_owner=903794441882" \
--var="instance_type=t4g.xlarge" \
template.json
```
packer/jambonz-sbc-rtp/template.json
+1 -1
View File
@@ -4,7 +4,7 @@
"ssh_username": "admin",
"ami_description": "jambonz SBC RTP server",
"drachtio_version": "v0.8.18",
"jambonz_version": "v0.7.7-10",
"jambonz_version": "v0.7.7-11",
"ami_base_image_arch": "amd64",
"ami_base_image_owner": "136693071363",
"instance_type": "t3.xlarge",
packer/jambonz-sbc-sip/README.md
-1
View File
@@ -15,7 +15,6 @@ To build an arm64 image:
```
$ packer build -color=false \
--var="ami_base_image_arch=arm64" \
--var="ami_base_image_owner=903794441882" \
--var="instance_type=t4g.xlarge" \
template.json
```
packer/jambonz-sbc-sip/template.json
+1 -1
View File
@@ -5,7 +5,7 @@
"ami_description": "jambonz SBC SIP",
"instance_type": "t3.xlarge",
"drachtio_version": "v0.8.18",
"jambonz_version": "v0.7.7-10",
"jambonz_version": "v0.7.7-11",
"ami_base_image_arch": "amd64",
"ami_base_image_owner": "136693071363",
"install_datadog": "no",
packer/jambonz-web-server/scripts/install_app.sh
+1 -1
View File
@@ -5,7 +5,7 @@ cd /home/admin/apps
cp /tmp/ecosystem.config.js .
echo "building jambonz-api-server.."
cd /home/admin/apps/jambonz-api-server && npm ci
cd /home/admin/apps/jambonz-api-server && npm ci --unsafe-perm
echo "building jambonz-webapp.."
cd /home/admin/apps/jambonz-webapp && npm ci && npm run build
echo "building public-apps.."
packer/jambonz-web-server/template.json
+1 -1
View File
@@ -4,7 +4,7 @@
"ssh_username": "admin",
"ami_description": "jambonz webserver",
"instance_type": "t3.xlarge",
"jambonz_version": "v0.7.7-10",
"jambonz_version": "v0.7.7-11",
"ami_base_image_arch": "amd64",
"ami_base_image_owner": "136693071363",
"install_datadog": "no",