Commit graph

595 commits

Author SHA1 Message Date
Samuel Clay
2074f6d6a3 Merge branch 'master' into pro
* master:
  Deploying new asset pipeline
  Removing unused google-closure-compiler executable. Now using java.
  Sanity checker logs needs permissions for writing.
  Fixing Import Sites button, broken by a typo.
  Newsletters bouncing looks good.
  Fixing string interpolation
  Image previews should be 60% on read stories.
  Turning off keyfile
2022-01-19 15:27:35 -05:00
Samuel Clay
4e8ffa2094 Deploying new asset pipeline 2022-01-19 15:22:05 -05:00
Samuel Clay
2554984717 Merge branch 'pipeline' into pro
* pipeline:
  Installing Java in deploy image to get closure compiler working. Also updating closure binary path.
  Ensuring dependencies met for deployment on local.
  Updating to docker buildx for multi-arch builds (amd64 + arm64)
2022-01-19 13:01:38 -05:00
Samuel Clay
d0fdbde96b Ensuring dependencies met for deployment on local. 2022-01-19 10:48:11 -05:00
Samuel Clay
0f27ba81e0 Updating to docker buildx for multi-arch builds (amd64 + arm64) 2022-01-18 17:25:07 -05:00
Samuel Clay
b8030b4701 Merge branch 'pipeline' into pro
* pipeline:
  Celery also has a set user.
  Setting the user for celery and newsblur_web in both prod and docker-compose so that logs are always under the right user. Fixes #1593.
  Making add_site callback optional to support iOS. #1584
  Adding check for renaming a feed that a user isn't subscribed to.
  Finishing up PostgreSQL migration. Needs to test backups.
  Handling unreadable POST for push feeds and their fat pings.
  Android v11.2
  Schedule and cancel subscription sync services based on user auth state.
  Check for authenticated user before a subscription sync.
  Subscription sync service running every 24 hours to sync if necessary the user's premium subscription state between NewsBlur and Play Store.
  Upgrade subscriptions to billing 4.0
  Subscription manager to handle billing and subscription syncs between Play Store and NewsBlur.
  #1573 Feed search favicon loading.
  Replace cursor loaders (#9)
  Fixing grafana sentry integration.
  Adding sentry grafana pluging.
  Boosting timeout for docker prune
  Don't prune docker unless needed.
  Update docker-compose.yml
2022-01-11 11:00:12 -05:00
Samuel Clay
61450de5f8 Merge branch 'master' into pipeline
* master:
  Celery also has a set user.
  Setting the user for celery and newsblur_web in both prod and docker-compose so that logs are always under the right user. Fixes #1593.
  Making add_site callback optional to support iOS. #1584
  Adding check for renaming a feed that a user isn't subscribed to.
  Finishing up PostgreSQL migration. Needs to test backups.
  Handling unreadable POST for push feeds and their fat pings.
  Android v11.2
  Schedule and cancel subscription sync services based on user auth state.
  Check for authenticated user before a subscription sync.
  Subscription sync service running every 24 hours to sync if necessary the user's premium subscription state between NewsBlur and Play Store.
  Upgrade subscriptions to billing 4.0
  Subscription manager to handle billing and subscription syncs between Play Store and NewsBlur.
  #1573 Feed search favicon loading.
  Replace cursor loaders (#9)
  Fixing grafana sentry integration.
  Adding sentry grafana pluging.
  Boosting timeout for docker prune
  Don't prune docker unless needed.
  Update docker-compose.yml
2022-01-11 11:00:06 -05:00
Samuel Clay
db2a87df06 Counting pro subscribers. 2022-01-10 17:00:27 -05:00
Samuel Clay
72bb032842 Celery also has a set user. 2022-01-10 09:52:57 -05:00
Samuel Clay
8f894bce31 Setting the user for celery and newsblur_web in both prod and docker-compose so that logs are always under the right user. Fixes #1593. 2022-01-10 09:51:46 -05:00
Samuel Clay
09551d5d8f Finishing up PostgreSQL migration. Needs to test backups. 2022-01-07 15:47:36 -05:00
Samuel Clay
ddeaf55be0 Cleaning up pipeline and adding admin static assets, but now certain admin static assets are being post-processed multiple times but with different cache manifests, resulting in a file not found error. This needs work. 2022-01-06 11:01:35 -05:00
Samuel Clay
688b3524a3 Fixing grafana sentry integration. 2022-01-05 15:18:26 -05:00
Samuel Clay
6108f2a067 Adding sentry grafana pluging. 2022-01-05 13:22:24 -05:00
Samuel Clay
76ffe7bb8a Fixing bookmarklet, moving endlne fleuron, adding load-line, archviing Jammit. 2022-01-05 11:18:31 -05:00
Samuel Clay
04c62b11c7 Cleaning up static assets. Needs to run on first make nb or DEBUG_ASSETS needs to always be set to True. 2022-01-04 15:54:37 -05:00
Samuel Clay
d06e871ee2 Boosting timeout for docker prune 2022-01-04 15:14:22 -05:00
Samuel Clay
3e348329b3 Don't prune docker unless needed. 2022-01-04 15:09:01 -05:00
Samuel Clay
b8eccdbed4 Merge branch 'master' into pipeline
* master:
  Fixing names for state timeline, also fixing node server bootstrap.
  Moving up haproxy state timeline
  Bumping haproxy state timeline scrapes.
  Only need haproxy for haproxy metrics
  Refactored state timeline to work as a flask metrics server on haproxy. Needs ansible configs to deploy on www server.
  Forgot to save merge conflict.
  fix service state timeline key error and change scrape interval
  Revert "Revert "Merge branch 'state_timeline'""
  Revert "Merge branch 'state_timeline'"
  Fixing syntax error
  Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
  Mongo analytics monitor not reayd yet
  Turning consul monitor back on.
  Turning on analytics
  Need to strip csv values.
  Binding redis to public interface.
  add grafana dashboard backup functionality
2022-01-04 14:44:57 -05:00
Samuel Clay
8de2bfcbae Fixing names for state timeline, also fixing node server bootstrap. 2022-01-04 14:44:47 -05:00
Samuel Clay
af7524a976 Bumping haproxy state timeline scrapes. 2022-01-04 12:51:45 -05:00
Samuel Clay
9432e9a5b8 Merge branch 'master' into pipeline
* master:
  Pruning docker, updating sentry release webhook only on local.
  Delete .github directory
  Adding Sentry release webhook to deployment of web, task, monitor, and node.
  Add Sentry action workflow for actions
  Moving from hosted Sentry to self-hosted sentry.
  Flask transactions are way too often.
  Cleanup
  Seems redundant with newsblur_web/docker_local_settings.py
  Using new repo password for postgres.
  Moving around postgres config
  Moving directories.
  Adding postgresql backup restoration. Working on config.
  Using user log for db times.
  Last 5 minutes is actually last minute.
  Adding 5min loadtime to prometheus graphs.
  Switching back to nbanalytics with user auth.
  Mongo auth
2022-01-03 18:04:40 -05:00
Samuel Clay
e227e651ed Pruning docker, updating sentry release webhook only on local. 2022-01-03 17:24:57 -05:00
Samuel Clay
259dff477e Adding Sentry release webhook to deployment of web, task, monitor, and node. 2022-01-03 15:27:53 -05:00
Samuel Clay
e5e3162f89 Moving from hosted Sentry to self-hosted sentry. 2022-01-03 14:48:39 -05:00
Samuel Clay
f33c1b3600 Using new repo password for postgres. 2021-12-17 17:35:01 -05:00
Samuel Clay
6b8e747ebc Moving around postgres config 2021-12-17 17:11:54 -05:00
Samuel Clay
aee543d913 Moving directories. 2021-12-17 16:56:30 -05:00
Samuel Clay
62529e96c2 Adding postgresql backup restoration. Working on config. 2021-12-17 16:53:28 -05:00
Samuel Clay
f36a4f8fd5 Mongo auth 2021-12-16 20:30:27 -05:00
Samuel Clay
9ced4ccadd Merge branch 'master' into pipeline
* master: (84 commits)
  Deploying new analytics server.
  Create mongodb database user. Only runs on analytics, but should work fine on main mongo.
  Adding second mongo analytics db, cleaning up mongo analytics auth.
  Adding RSS autodiscovery to blog. Thanks https://forum.newsblur.com/t/irony-newsblur-cant-auto-extract-rss-feed-from-blog-newsblur-com/8849.
  Revert "Merge branch 'state_timeline'"
  Fixing syntax error
  Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
  fix flask_metrics ansible role
  add state timeline dashboard to grafana
  move state timeline to one single flask that gets astate for all services
  Mongo analytics monitor not reayd yet
  Turning consul monitor back on.
  Turning on analytics
  Need to strip csv values.
  Binding redis to public interface.
  Restore postgres backup. Needs work.
  Prepping postgres backup
  Prepping postgres transition, writing redis db maintenance.
  Prepping redis for moving back to primary.
  Updating redis backup to include percentage progress and access to the correct data dump.
  ...
2021-12-16 15:41:57 -05:00
Samuel Clay
ef62d212ab Deploying new analytics server. 2021-12-16 15:31:12 -05:00
Samuel Clay
8b6452b094 Create mongodb database user. Only runs on analytics, but should work fine on main mongo. 2021-12-16 15:02:27 -05:00
Samuel Clay
ea6103bc8f Adding second mongo analytics db, cleaning up mongo analytics auth. 2021-12-16 13:48:20 -05:00
Samuel Clay
e70ba4a8c0 Revert "Merge branch 'state_timeline'"
This reverts commit 83e4609af1, reversing
changes made to 089161b20f.
2021-12-15 14:17:48 -05:00
Samuel Clay
5008d42a8e Merge branch 'master' into state_timeline
* master:
  Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo.
  Mongo analytics monitor not reayd yet
  Turning consul monitor back on.
  Turning on analytics
  Need to strip csv values.
  Binding redis to public interface.
2021-12-15 13:34:11 -05:00
Samuel Clay
089161b20f Solving docker networking container issues by turning iptables back on but using ufw after.rules that allow ufw to retain blocking ability. Works on Redis, now to move to mongo. 2021-12-15 13:34:01 -05:00
Jonathan Math
cf917b43e5 fix flask_metrics ansible role 2021-12-15 11:37:43 -05:00
Jonathan Math
99dd44a435 move state timeline to one single flask that gets astate for all services 2021-12-15 11:35:16 -05:00
Samuel Clay
8da118f653 Restore postgres backup. Needs work. 2021-12-14 08:22:19 -05:00
Samuel Clay
777e69ae82 Prepping postgres backup 2021-12-13 17:09:37 -05:00
Samuel Clay
5b0ef4dbd6 Prepping redis for moving back to primary. 2021-12-13 15:31:21 -05:00
Samuel Clay
8bceaada80 Updating redis backup to include percentage progress and access to the correct data dump. 2021-12-13 14:26:20 -05:00
Samuel Clay
be3237cdc3 Updating to boto3 syntax. 2021-12-13 12:45:47 -05:00
Samuel Clay
58d6c00bfa Bumping mongo size 2021-12-09 13:20:02 -05:00
Samuel Clay
35bc9ad07f Rewriting readme from #1545. 2021-12-08 14:55:26 -05:00
Samuel Clay
d385495ef5 Explicit prometheus command, modeled after the dockerhub image. We're not using --web.console.libraries=/usr/share/prometheus/console_libraries --web.console.templates=/usr/share/prometheus/consoles 2021-12-07 16:23:05 -05:00
Samuel Clay
e63ad6193b Explicit config file 2021-12-07 11:16:00 -05:00
Samuel Clay
b7995547e4 Merge branch 'master' into prometheus_retention
* master:
  Turning refresh stale feeds back on.
  Terraform Digital Ocean v2.0
  Adjusting sizes
  Better topline metrics
  Cleaning up redis dashboard.
  Flask metrics may not have the port, use default.
2021-12-07 11:11:18 -05:00
Samuel Clay
0f81b9dfa1 Flask metrics may not have the port, use default. 2021-12-07 07:16:31 -05:00